@hubspot/cli 7.10.0 → 7.10.1-experimental.0

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -1,7 +1,5 @@
-import { getAccountId } from '@hubspot/local-dev-lib/config';
 import { getSandboxUsageLimits } from '@hubspot/local-dev-lib/api/sandboxHubs';
 import { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } from '@hubspot/local-dev-lib/constants/config';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 import { fetchDeveloperTestAccounts } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { promptUser } from './promptUtils.js';
 import { lib } from '../../lang/en.js';
@@ -12,9 +10,9 @@ import { EXIT_CODES } from '../enums/exitCodes.js';
 function mapNestedAccount(accountConfig) {
     const parentAccountId = accountConfig.parentAccountId ?? null;
     return {
-        name: uiAccountDescription(getAccountIdentifier(accountConfig), false),
+        name: uiAccountDescription(accountConfig.accountId, false),
         value: {
-            targetAccountId: getAccountId(accountConfig.name),
+            targetAccountId: accountConfig.accountId,
             createNestedAccount: false,
             parentAccountId,
         },
@@ -24,7 +22,7 @@ function getNonConfigDeveloperTestAccountName(account) {
     return `${account.accountName} [${HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST]}] (${account.id})`;
 }
 export async function selectSandboxTargetAccountPrompt(accounts, defaultAccountConfig) {
-    const defaultAccountId = getAccountId(defaultAccountConfig.name);
+    const defaultAccountId = defaultAccountConfig.accountId;
     let choices = [];
     let sandboxUsage = {
         STANDARD: { used: 0, available: 0, limit: 0 },
@@ -84,7 +82,7 @@ export async function selectSandboxTargetAccountPrompt(accounts, defaultAccountC
     return selectTargetAccountPrompt(defaultAccountId, 'sandbox account', choices);
 }
 export async function selectDeveloperTestTargetAccountPrompt(accounts, defaultAccountConfig) {
-    const defaultAccountId = getAccountId(defaultAccountConfig.name);
+    const defaultAccountId = defaultAccountConfig.accountId;
     let devTestAccountsResponse;
     try {
         if (defaultAccountId) {
@@ -108,7 +106,7 @@ export async function selectDeveloperTestTargetAccountPrompt(accounts, defaultAc
     }
     const devTestAccounts = [];
     if (devTestAccountsResponse && devTestAccountsResponse.results) {
-        const accountIds = accounts.map(account => getAccountIdentifier(account));
+        const accountIds = accounts.map(account => account.accountId);
         devTestAccountsResponse.results.forEach(acct => {
             const inConfig = accountIds.includes(acct.id);
             devTestAccounts.push({

package/lib/prompts/sandboxesPrompt.js

@@ -2,23 +2,22 @@ import { promptUser } from './promptUtils.js';
 import { lib } from '../../lang/en.js';
 import { uiAccountDescription } from '../ui/index.js';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 import { isSandbox } from '../accountTypes.js';
-import { getConfigDefaultAccount, getConfigAccounts, } from '@hubspot/local-dev-lib/config';
+import { getConfigDefaultAccountIfExists, getAllConfigAccounts, } from '@hubspot/local-dev-lib/config';
 function mapSandboxAccountChoices(portals) {
     return (portals
         ?.filter(p => isSandbox(p))
         .map(p => ({
-        name: uiAccountDescription(getAccountIdentifier(p), false),
-        value: p.name || getAccountIdentifier(p),
+        name: uiAccountDescription(p.accountId, false),
+        value: p.accountId,
     })) || []);
 }
 function mapNonSandboxAccountChoices(portals) {
     return (portals
         ?.filter(p => !isSandbox(p))
         .map(p => ({
-        name: `${p.name} (${getAccountIdentifier(p)})`,
-        value: p.name || getAccountIdentifier(p),
+        name: `${p.name} (${p.accountId})`,
+        value: p.accountId,
     })) || []);
 }
 export async function sandboxTypePrompt() {
@@ -42,7 +41,7 @@ export async function sandboxTypePrompt() {
     ]);
 }
 export function deleteSandboxPrompt(promptParentAccount = false) {
-    const accountsList = getConfigAccounts();
+    const accountsList = getAllConfigAccounts();
     const choices = promptParentAccount
         ? mapNonSandboxAccountChoices(accountsList)
         : mapSandboxAccountChoices(accountsList);
@@ -58,7 +57,7 @@ export function deleteSandboxPrompt(promptParentAccount = false) {
             type: 'list',
             pageSize: 20,
             choices,
-            default: getConfigDefaultAccount(),
+            default: getConfigDefaultAccountIfExists()?.accountId,
         },
     ]);
 }

package/lib/prompts/setAsDefaultAccountPrompt.js

@@ -1,25 +1,26 @@
-import { updateDefaultAccount, getConfigDefaultAccount, } from '@hubspot/local-dev-lib/config';
+import { setConfigAccountAsDefault, getConfigDefaultAccountIfExists, getAllConfigAccounts, } from '@hubspot/local-dev-lib/config';
 import { promptUser } from './promptUtils.js';
 import { lib } from '../../lang/en.js';
 import { uiLogger } from '../ui/logger.js';
 export async function setAsDefaultAccountPrompt(accountName) {
     // Accounts for deprecated and new config
-    const defaultAccount = getConfigDefaultAccount();
+    const defaultAccount = getConfigDefaultAccountIfExists();
+    const accounts = getAllConfigAccounts() || [];
     const { setAsDefault } = await promptUser([
         {
             name: 'setAsDefault',
             type: 'confirm',
-            when: defaultAccount !== accountName,
+            when: accounts.length >= 1 && defaultAccount?.name !== accountName,
             message: lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccountMessage,
         },
     ]);
     uiLogger.log('');
     if (setAsDefault) {
-        updateDefaultAccount(accountName);
+        setConfigAccountAsDefault(accountName);
         uiLogger.success(lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount(accountName));
     }
-    else {
-        uiLogger.log(lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault(getConfigDefaultAccount()));
+    else if (defaultAccount) {
+        uiLogger.log(lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault(defaultAccount.name));
     }
     return setAsDefault;
 }

package/lib/sandboxSync.d.ts

@@ -1,4 +1,4 @@
-import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
+import { HubSpotConfigAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { Environment } from '@hubspot/local-dev-lib/types/Config';
 import { SandboxSyncTask } from '../types/Sandboxes.js';
-export declare function syncSandbox(accountConfig: CLIAccount, parentAccountConfig: CLIAccount, env: Environment, syncTasks: Array<SandboxSyncTask>, slimInfoMessage?: boolean): Promise<void>;
+export declare function syncSandbox(accountConfig: HubSpotConfigAccount, parentAccountConfig: HubSpotConfigAccount, env: Environment, syncTasks: Array<SandboxSyncTask>, slimInfoMessage?: boolean): Promise<void>;

package/lib/sandboxSync.js

@@ -3,23 +3,17 @@ import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { uiLogger } from './ui/logger.js';
 import { initiateSync } from '@hubspot/local-dev-lib/api/sandboxSync';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
-import { getAccountId } from '@hubspot/local-dev-lib/config';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 import { lib } from '../lang/en.js';
 import { getAvailableSyncTypes, getSandboxTypeAsString } from './sandboxes.js';
 import { debugError, logError, ApiErrorContext, } from './errorHandlers/index.js';
 import { uiAccountDescription, uiLine, uiCommandDisabledBanner, } from './ui/index.js';
 import { isDevelopmentSandbox } from './accountTypes.js';
 export async function syncSandbox(accountConfig, parentAccountConfig, env, syncTasks, slimInfoMessage = false) {
-    const id = getAccountIdentifier(accountConfig);
-    const accountId = getAccountId(id);
-    const parentId = getAccountIdentifier(parentAccountConfig);
-    const parentAccountId = getAccountId(parentId);
+    const accountId = accountConfig.accountId;
+    const parentAccountId = parentAccountConfig.accountId;
     const isDevSandbox = isDevelopmentSandbox(accountConfig);
     if (!accountId || !parentAccountId) {
-        throw new Error(lib.sandbox.sync.failure.invalidUser(accountId ? uiAccountDescription(accountId) : id.toString(), parentAccountId
-            ? uiAccountDescription(parentAccountId)
-            : parentId.toString()));
+        throw new Error(lib.sandbox.sync.failure.invalidUser(uiAccountDescription(accountId), uiAccountDescription(parentAccountId)));
     }
     SpinniesManager.init({
         succeedColor: 'white',

package/lib/sandboxes.d.ts

@@ -1,4 +1,4 @@
-import { AccountType, CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
+import { AccountType, HubSpotConfigAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { Environment } from '@hubspot/local-dev-lib/types/Config';
 import { SandboxSyncTask, SandboxAccountType } from '../types/Sandboxes.js';
 export declare const SYNC_TYPES: {
@@ -16,7 +16,7 @@ export declare const SANDBOX_TYPE_MAP_V2: {
     readonly DEVELOPMENT_SANDBOX: "DEVELOPER";
 };
 export declare function getSandboxTypeAsString(accountType?: AccountType): string;
-export declare function getHasSandboxesByType(parentAccountConfig: CLIAccount, type: AccountType): boolean;
-export declare function getAvailableSyncTypes(parentAccountConfig: CLIAccount, config: CLIAccount): Promise<Array<SandboxSyncTask>>;
-export declare function validateSandboxUsageLimits(accountConfig: CLIAccount, sandboxType: AccountType, env: Environment): Promise<void>;
+export declare function getHasSandboxesByType(parentAccountConfig: HubSpotConfigAccount, type: AccountType): boolean;
+export declare function getAvailableSyncTypes(parentAccountConfig: HubSpotConfigAccount, config: HubSpotConfigAccount): Promise<Array<SandboxSyncTask>>;
+export declare function validateSandboxUsageLimits(accountConfig: HubSpotConfigAccount, sandboxType: AccountType, env: Environment): Promise<void>;
 export declare function handleSandboxCreateError(err: unknown, env: Environment, name: string, accountId: number): never;

package/lib/sandboxes.js

@@ -1,9 +1,8 @@
 import { getSandboxUsageLimits } from '@hubspot/local-dev-lib/api/sandboxHubs';
 import { fetchTypes } from '@hubspot/local-dev-lib/api/sandboxSync';
-import { getAccountId, getConfigAccounts } from '@hubspot/local-dev-lib/config';
+import { getAllConfigAccounts } from '@hubspot/local-dev-lib/config';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 import { isMissingScopeError, isSpecifiedError, } from '@hubspot/local-dev-lib/errors/index';
 import { uiLogger } from './ui/logger.js';
 import { lib } from '../lang/en.js';
@@ -33,9 +32,8 @@ export function getSandboxTypeAsString(accountType) {
     return 'standard';
 }
 export function getHasSandboxesByType(parentAccountConfig, type) {
-    const id = getAccountIdentifier(parentAccountConfig);
-    const parentPortalId = getAccountId(id);
-    const accountsList = getConfigAccounts() || [];
+    const parentPortalId = parentAccountConfig.accountId;
+    const accountsList = getAllConfigAccounts();
     for (const portal of accountsList) {
         if ((portal.parentAccountId !== null ||
             portal.parentAccountId !== undefined) &&
@@ -49,10 +47,8 @@ export function getHasSandboxesByType(parentAccountConfig, type) {
 }
 // Fetches available sync types for a given sandbox portal
 export async function getAvailableSyncTypes(parentAccountConfig, config) {
-    const parentId = getAccountIdentifier(parentAccountConfig);
-    const parentPortalId = getAccountId(parentId);
-    const id = getAccountIdentifier(config);
-    const portalId = getAccountId(id);
+    const parentPortalId = parentAccountConfig.accountId;
+    const portalId = config.accountId;
     if (!parentPortalId || !portalId) {
         throw new Error(lib.sandbox.sync.failure.syncTypeFetch);
     }
@@ -63,8 +59,7 @@ export async function getAvailableSyncTypes(parentAccountConfig, config) {
     return syncTypes.map(t => ({ type: t.name }));
 }
 export async function validateSandboxUsageLimits(accountConfig, sandboxType, env) {
-    const id = getAccountIdentifier(accountConfig);
-    const accountId = getAccountId(id);
+    const accountId = accountConfig.accountId;
     if (!accountId) {
         throw new Error(lib.sandbox.create.failure.usageLimitsFetch);
     }

package/lib/serverlessLogs.js

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import { uiLogger } from './ui/logger.js';
 import { isHubSpotHttpError, isMissingScopeError, } from '@hubspot/local-dev-lib/errors/index';
 import { SCOPE_GROUPS, PERSONAL_ACCESS_KEY_AUTH_METHOD, } from '@hubspot/local-dev-lib/constants/auth';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { fetchScopeData } from '@hubspot/local-dev-lib/api/localDevAuth';
 import { outputLogs } from './ui/serverlessFunctionLogs.js';
 import { logError, ApiErrorContext } from './errorHandlers/index.js';
@@ -33,7 +33,7 @@ function handleUserInput() {
     });
 }
 async function verifyAccessKeyAndUserAccess(accountId, scopeGroup) {
-    const accountConfig = getAccountConfig(accountId);
+    const accountConfig = getConfigAccountById(accountId);
     if (!accountConfig) {
         return;
     }

package/lib/theme/__tests__/migrate.test.js

@@ -1,4 +1,5 @@
 import { getProjectThemeDetails, migrateThemes, } from '@hubspot/project-parsing-lib';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { confirmPrompt } from '../../prompts/promptUtils.js';
 import { writeProjectConfig, } from '../../projects/config.js';
 import { ensureProjectExists } from '../../projects/ensureProjectExists.js';
@@ -13,6 +14,7 @@ vi.mock('../../projects/config');
 vi.mock('../../projects/ensureProjectExists');
 vi.mock('../../projects/platformVersion');
 vi.mock('../../app/migrate');
+vi.mock('@hubspot/local-dev-lib/config');
 const mockedGetProjectThemeDetails = getProjectThemeDetails;
 const mockedMigrateThemes = migrateThemes;
 const mockedConfirmPrompt = confirmPrompt;
@@ -20,6 +22,7 @@ const mockedWriteProjectConfig = writeProjectConfig;
 const mockedEnsureProjectExists = ensureProjectExists;
 const mockedUseV2Api = isV2Project;
 const mockedFetchMigrationApps = fetchMigrationApps;
+const mockedGetConfigAccountById = getConfigAccountById;
 const ACCOUNT_ID = 123;
 const PROJECT_NAME = 'Test Project';
 const PLATFORM_VERSION = '2025.2';
@@ -31,6 +34,18 @@ const createLoadedProjectConfig = (name) => ({
 describe('lib/theme/migrate', () => {
     beforeEach(() => {
         mockedUseV2Api.mockReturnValue(false);
+        // Mock account config for the test account ID
+        mockedGetConfigAccountById.mockReturnValue({
+            accountId: ACCOUNT_ID,
+            name: 'Test Account',
+            authType: 'personalaccesskey',
+            auth: {
+                tokenInfo: {
+                    accessToken: 'test-token',
+                },
+            },
+            env: 'prod',
+        });
     });
     describe('getHasMigratableThemes', () => {
         it('should return false when no projectConfig is provided', async () => {

package/lib/ui/index.js

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import { getAccountConfig, configFileExists, } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountIfExists, globalConfigFileExists, } from '@hubspot/local-dev-lib/config';
 import { uiLogger } from './logger.js';
 import { supportsHyperlinkModule } from './supportHyperlinks.js';
 import { supportsColor } from './supportsColor.js';
@@ -38,7 +38,7 @@ export function uiLink(linkText, url) {
         : `${linkText}: ${encodedUrl}`;
 }
 export function uiAccountDescription(accountId, bold = true) {
-    const account = getAccountConfig(accountId || undefined);
+    const account = accountId ? getConfigAccountIfExists(accountId) : undefined;
     let message;
     if (account && account.accountType) {
         message = `${account.name ? `${account.name} ` : ''}[${HUBSPOT_ACCOUNT_TYPE_STRINGS[account.accountType]}] (${accountId})`;
@@ -46,6 +46,9 @@ export function uiAccountDescription(accountId, bold = true) {
     else {
         message = accountId ? accountId.toString() : '';
     }
+    if (message.trim().length === 0) {
+        return 'unknown account';
+    }
     return bold ? chalk.bold(message) : message;
 }
 export function uiInfoSection(title, logContent) {
@@ -64,7 +67,7 @@ export function uiCommandReference(command, withQuotes = true) {
         : commandReference);
 }
 export function uiAuthCommandReference({ accountId, qa, } = {}) {
-    const userIsUsingGlobalConfig = configFileExists(true);
+    const userIsUsingGlobalConfig = globalConfigFileExists();
     let command = 'hs auth';
     if (userIsUsingGlobalConfig) {
         command = 'hs account auth';

package/lib/usageTracking.js

@@ -1,5 +1,5 @@
 import { trackUsage } from '@hubspot/local-dev-lib/trackUsage';
-import { isTrackingAllowed, getAccountConfig, } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById, getConfig } from '@hubspot/local-dev-lib/config';
 import { API_KEY_AUTH_METHOD } from '@hubspot/local-dev-lib/constants/auth';
 import { uiLogger } from './ui/logger.js';
 import { pkg } from './jsonLoader.js';
@@ -28,13 +28,17 @@ export function getPlatform() {
     }
 }
 export async function trackCommandUsage(command, meta = {}, accountId) {
-    if (!isTrackingAllowed()) {
-        return;
+    try {
+        const config = getConfig();
+        if (config?.allowUsageTracking === false) {
+            return;
+        }
     }
+    catch (e) { }
     uiLogger.debug(`Attempting to track usage of "${command}" command`);
     let authType = 'unknown';
     if (accountId) {
-        const accountConfig = getAccountConfig(accountId);
+        const accountConfig = getConfigAccountById(accountId);
         authType =
             accountConfig && accountConfig.authType
                 ? accountConfig.authType
@@ -49,7 +53,8 @@ export async function trackCommandUsage(command, meta = {}, accountId) {
     });
 }
 export async function trackHelpUsage(command) {
-    if (!isTrackingAllowed()) {
+    const config = getConfig();
+    if (config?.allowUsageTracking === false) {
         return;
     }
     if (command) {
@@ -81,13 +86,14 @@ export async function trackAuthAction(command, authType, step, accountId) {
     });
 }
 export async function trackCommandMetadataUsage(command, meta = {}, accountId) {
-    if (!isTrackingAllowed()) {
+    const config = getConfig();
+    if (config?.allowUsageTracking === false) {
         return;
     }
     uiLogger.debug(`Attempting to track metadata usage of "${command}" command`);
     let authType = 'unknown';
     if (accountId) {
-        const accountConfig = getAccountConfig(accountId);
+        const accountConfig = getConfigAccountById(accountId);
         authType =
             accountConfig && accountConfig.authType
                 ? accountConfig.authType
@@ -103,7 +109,8 @@ export async function trackCommandMetadataUsage(command, meta = {}, accountId) {
 }
 async function trackCliInteraction({ action, accountId, command, authType, meta = {}, }) {
     try {
-        if (!isTrackingAllowed()) {
+        const config = getConfig();
+        if (config?.allowUsageTracking === false) {
             return;
         }
         const usageTrackingEvent = {

package/lib/validation.js

@@ -4,16 +4,17 @@ import { uiLogger } from '../lib/ui/logger.js';
 import { CMS_PUBLISH_MODE } from '@hubspot/local-dev-lib/constants/files';
 import { API_KEY_AUTH_METHOD, OAUTH_AUTH_METHOD, PERSONAL_ACCESS_KEY_AUTH_METHOD, } from '@hubspot/local-dev-lib/constants/auth';
 import { commaSeparatedValues } from '@hubspot/local-dev-lib/text';
-import { getConfigPath, getAccountConfig, getAccountId, loadConfigFromEnvironment, } from '@hubspot/local-dev-lib/config';
+import { getConfigFilePath, getConfigAccountById, } from '@hubspot/local-dev-lib/config';
 import { getOauthManager } from '@hubspot/local-dev-lib/oauth';
 import { accessTokenForPersonalAccessKey } from '@hubspot/local-dev-lib/personalAccessKey';
 import { getAbsoluteFilePath, getCwd, getExt, } from '@hubspot/local-dev-lib/path';
+import { ENVIRONMENT_VARIABLES } from '@hubspot/local-dev-lib/constants/config';
 import { getCmsPublishMode } from './commonOpts.js';
 import { logError } from './errorHandlers/index.js';
 import { lib } from '../lang/en.js';
 export async function validateAccount(options) {
     const { derivedAccountId, userProvidedAccount } = options;
-    const accountId = getAccountId(derivedAccountId);
+    const accountId = derivedAccountId;
     if (!accountId) {
         if (userProvidedAccount) {
             uiLogger.error(lib.validation.accountNotFoundInConfig(userProvidedAccount));
@@ -23,33 +24,34 @@ export async function validateAccount(options) {
         }
         return false;
     }
-    if (userProvidedAccount && loadConfigFromEnvironment()) {
+    if (userProvidedAccount &&
+        process.env[ENVIRONMENT_VARIABLES.USE_ENVIRONMENT_HUBSPOT_CONFIG]) {
         throw new Error(lib.validation.userProvidedAccount);
     }
-    const accountConfig = getAccountConfig(accountId);
+    const accountConfig = getConfigAccountById(accountId);
     if (!accountConfig) {
         uiLogger.error(lib.validation.accountNotConfigured(accountId));
         return false;
     }
-    const { authType, auth, apiKey, personalAccessKey } = accountConfig;
+    const { authType } = accountConfig;
     if (typeof authType === 'string' && authType !== authType.toLowerCase()) {
-        uiLogger.error(lib.validation.invalidAuthType(authType, accountId, getConfigPath() || '', commaSeparatedValues([
+        uiLogger.error(lib.validation.invalidAuthType(authType, accountId, getConfigFilePath(), commaSeparatedValues([
             PERSONAL_ACCESS_KEY_AUTH_METHOD,
             OAUTH_AUTH_METHOD,
             API_KEY_AUTH_METHOD,
         ].map(method => method.value))));
     }
     if (authType === 'oauth2') {
-        if (typeof auth !== 'object') {
+        if (typeof accountConfig.auth !== 'object') {
             uiLogger.error(lib.validation.oauth2ConfigMissing(accountId));
             return false;
         }
-        const { clientId, clientSecret, tokenInfo } = auth;
+        const { clientId, clientSecret, tokenInfo } = accountConfig.auth;
         if (!clientId || !clientSecret || !tokenInfo || !tokenInfo.refreshToken) {
             uiLogger.error(lib.validation.oauth2ConfigIncorrect(accountId));
             return false;
         }
-        const oauth = getOauthManager(accountId, accountConfig);
+        const oauth = getOauthManager(accountConfig);
         try {
             let accessToken;
             if (oauth) {
@@ -66,7 +68,7 @@ export async function validateAccount(options) {
         }
     }
     else if (authType === 'personalaccesskey') {
-        if (!personalAccessKey) {
+        if (!accountConfig.personalAccessKey) {
             uiLogger.error(lib.validation.personalAccessKeyMissing(accountId));
             return false;
         }
@@ -82,7 +84,7 @@ export async function validateAccount(options) {
             return false;
         }
     }
-    else if (!apiKey) {
+    else if (!accountConfig.apiKey) {
         uiLogger.error(lib.validation.authConfigurationMissing(accountId));
         return false;
     }

package/mcp-server/tools/cms/HsCreateFunctionTool.js

@@ -6,6 +6,7 @@ import { formatTextContents, formatTextContent } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { addFlag } from '../../utils/command.js';
 import { HTTP_METHODS } from '../../../types/Cms.js';
+import { setupHubSpotConfig } from '../../utils/config.js';
 const inputSchema = {
     absoluteCurrentWorkingDirectory,
     dest: z
@@ -37,6 +38,7 @@ export class HsCreateFunctionTool extends Tool {
         super(mcpServer);
     }
     async handler({ dest, functionsFolder, filename, endpointMethod, endpointPath, absoluteCurrentWorkingDirectory, }) {
+        setupHubSpotConfig(absoluteCurrentWorkingDirectory);
         await trackToolUsage(toolName);
         const content = [];
         // Require functions folder
@@ -80,10 +82,10 @@ export class HsCreateFunctionTool extends Tool {
         }
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
-            return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
+            return formatTextContents(stdout, stderr);
         }
         catch (error) {
-            return formatTextContents(absoluteCurrentWorkingDirectory, error instanceof Error ? error.message : `${error}`);
+            return formatTextContents(error instanceof Error ? error.message : `${error}`);
         }
     }
     register() {

package/mcp-server/tools/cms/HsCreateModuleTool.js

@@ -6,6 +6,7 @@ import { formatTextContents, formatTextContent } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { addFlag } from '../../utils/command.js';
 import { CONTENT_TYPES } from '../../../types/Cms.js';
+import { setupHubSpotConfig } from '../../utils/config.js';
 const inputSchema = {
     absoluteCurrentWorkingDirectory,
     userSuppliedName: z
@@ -53,6 +54,7 @@ export class HsCreateModuleTool extends Tool {
         super(mcpServer);
     }
     async handler({ userSuppliedName, dest, moduleLabel, reactType, contentTypes, global, availableForNewContent, absoluteCurrentWorkingDirectory, }) {
+        setupHubSpotConfig(absoluteCurrentWorkingDirectory);
         await trackToolUsage(toolName);
         const content = [];
         // Always require a name
@@ -102,10 +104,10 @@ export class HsCreateModuleTool extends Tool {
         }
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
-            return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
+            return formatTextContents(stdout, stderr);
         }
         catch (error) {
-            return formatTextContents(absoluteCurrentWorkingDirectory, error instanceof Error ? error.message : `${error}`);
+            return formatTextContents(error instanceof Error ? error.message : `${error}`);
         }
     }
     register() {

package/mcp-server/tools/cms/HsCreateTemplateTool.js

@@ -6,6 +6,7 @@ import { formatTextContents, formatTextContent } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { addFlag } from '../../utils/command.js';
 import { TEMPLATE_TYPES } from '../../../types/Cms.js';
+import { setupHubSpotConfig } from '../../utils/config.js';
 const inputSchema = {
     absoluteCurrentWorkingDirectory,
     userSuppliedName: z
@@ -29,6 +30,7 @@ export class HsCreateTemplateTool extends Tool {
         super(mcpServer);
     }
     async handler({ userSuppliedName, dest, templateType, absoluteCurrentWorkingDirectory, }) {
+        setupHubSpotConfig(absoluteCurrentWorkingDirectory);
         await trackToolUsage(toolName);
         const content = [];
         // Always require a name
@@ -59,10 +61,10 @@ export class HsCreateTemplateTool extends Tool {
         }
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
-            return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
+            return formatTextContents(stdout, stderr);
         }
         catch (error) {
-            return formatTextContents(absoluteCurrentWorkingDirectory, error instanceof Error ? error.message : `${error}`);
+            return formatTextContents(error instanceof Error ? error.message : `${error}`);
         }
     }
     register() {

package/mcp-server/tools/cms/HsFunctionLogsTool.js

@@ -5,6 +5,7 @@ import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
 import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
+import { setupHubSpotConfig } from '../../utils/config.js';
 const inputSchema = {
     absoluteCurrentWorkingDirectory,
     endpoint: z
@@ -32,6 +33,7 @@ export class HsFunctionLogsTool extends Tool {
         super(mcpServer);
     }
     async handler({ endpoint, account, latest, compact, limit, absoluteCurrentWorkingDirectory, }) {
+        setupHubSpotConfig(absoluteCurrentWorkingDirectory);
         await trackToolUsage(toolName);
         // Ensure endpoint doesn't start with '/'
         const normalizedEndpoint = endpoint.startsWith('/')
@@ -52,11 +54,11 @@ export class HsFunctionLogsTool extends Tool {
         }
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
-            return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
+            return formatTextContents(stdout, stderr);
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
-            return formatTextContents(absoluteCurrentWorkingDirectory, `Error executing hs logs command: ${errorMessage}`);
+            return formatTextContents(`Error executing hs logs command: ${errorMessage}`);
         }
     }
     register() {

package/mcp-server/tools/cms/HsListFunctionsTool.js

@@ -5,6 +5,7 @@ import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
 import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
+import { setupHubSpotConfig } from '../../utils/config.js';
 const inputSchema = {
     absoluteCurrentWorkingDirectory,
     account: z
@@ -24,6 +25,7 @@ export class HsListFunctionsTool extends Tool {
         super(mcpServer);
     }
     async handler({ account, json, absoluteCurrentWorkingDirectory, }) {
+        setupHubSpotConfig(absoluteCurrentWorkingDirectory);
         await trackToolUsage(toolName);
         let command = 'hs function list';
         if (json) {
@@ -34,7 +36,7 @@ export class HsListFunctionsTool extends Tool {
         }
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
-            return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
+            return formatTextContents(stdout, stderr);
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);

package/mcp-server/tools/cms/HsListTool.js

@@ -5,6 +5,7 @@ import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
 import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
+import { setupHubSpotConfig } from '../../utils/config.js';
 const inputSchema = {
     absoluteCurrentWorkingDirectory,
     path: z
@@ -24,6 +25,7 @@ export class HsListTool extends Tool {
         super(mcpServer);
     }
     async handler({ path, account, absoluteCurrentWorkingDirectory, }) {
+        setupHubSpotConfig(absoluteCurrentWorkingDirectory);
         await trackToolUsage(toolName);
         let command = 'hs list';
         if (path) {
@@ -34,7 +36,7 @@ export class HsListTool extends Tool {
         }
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
-            return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
+            return formatTextContents(stdout, stderr);
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);

package/mcp-server/tools/cms/__tests__/HsCreateFunctionTool.test.js

@@ -10,6 +10,7 @@ vi.mock('../../../utils/toolUsageTracking', () => ({
     trackToolUsage: vi.fn(),
 }));
 vi.mock('../../../utils/feedbackTracking');
+vi.mock('@hubspot/local-dev-lib/config');
 const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;