@hubspot/local-dev-lib 0.5.0-experimental.1 → 0.5.0-experimental.11

package/config/index.d.ts

@@ -2,20 +2,23 @@ import { HubSpotConfigAccount } from '../types/Accounts';
 import { HubSpotConfig, ConfigFlag } from '../types/Config';
 import { CmsPublishMode } from '../types/Files';
 import { Environment } from '../types/Config';
+export declare function getGlobalConfigFilePath(): string;
+export declare function getLocalConfigFilePathIfExists(): string | null;
 export declare function localConfigFileExists(): boolean;
 export declare function globalConfigFileExists(): boolean;
+export declare function configFileExists(): boolean;
 export declare function getConfigFilePath(): string;
 export declare function getConfig(): HubSpotConfig;
 export declare function isConfigValid(): boolean;
 export declare function createEmptyConfigFile(useGlobalConfig?: boolean): void;
-export declare function deleteConfigFile(): void;
+export declare function deleteConfigFileIfEmpty(): void;
 export declare function getConfigAccountById(accountId: number): HubSpotConfigAccount;
 export declare function getConfigAccountByName(accountName: string): HubSpotConfigAccount;
 export declare function getConfigAccountIfExists(identifier: number | string): HubSpotConfigAccount | undefined;
 export declare function getConfigDefaultAccount(): HubSpotConfigAccount;
 export declare function getConfigDefaultAccountIfExists(): HubSpotConfigAccount | undefined;
 export declare function getAllConfigAccounts(): HubSpotConfigAccount[];
-export declare function getConfigAccountEnvironment(identifier?: number | string): Environment;
+export declare function getConfigAccountEnvironment(identifier: number | string): Environment;
 export declare function addConfigAccount(accountToAdd: HubSpotConfigAccount): void;
 export declare function updateConfigAccount(updatedAccount: HubSpotConfigAccount): void;
 export declare function setConfigAccountAsDefault(identifier: number | string): void;

package/config/index.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeLocalStateFlag = exports.addLocalStateFlag = exports.hasLocalStateFlag = exports.isConfigFlagEnabled = exports.updateDefaultCmsPublishMode = exports.updateAutoOpenBrowser = exports.updateAllowAutoUpdates = exports.updateAllowUsageTracking = exports.updateHttpTimeout = exports.removeAccountFromConfig = exports.renameConfigAccount = exports.setConfigAccountAsDefault = exports.updateConfigAccount = exports.addConfigAccount = exports.getConfigAccountEnvironment = exports.getAllConfigAccounts = exports.getConfigDefaultAccountIfExists = exports.getConfigDefaultAccount = exports.getConfigAccountIfExists = exports.getConfigAccountByName = exports.getConfigAccountById = exports.deleteConfigFile = exports.createEmptyConfigFile = exports.isConfigValid = exports.getConfig = exports.getConfigFilePath = exports.globalConfigFileExists = exports.localConfigFileExists = void 0;
+exports.removeLocalStateFlag = exports.addLocalStateFlag = exports.hasLocalStateFlag = exports.isConfigFlagEnabled = exports.updateDefaultCmsPublishMode = exports.updateAutoOpenBrowser = exports.updateAllowAutoUpdates = exports.updateAllowUsageTracking = exports.updateHttpTimeout = exports.removeAccountFromConfig = exports.renameConfigAccount = exports.setConfigAccountAsDefault = exports.updateConfigAccount = exports.addConfigAccount = exports.getConfigAccountEnvironment = exports.getAllConfigAccounts = exports.getConfigDefaultAccountIfExists = exports.getConfigDefaultAccount = exports.getConfigAccountIfExists = exports.getConfigAccountByName = exports.getConfigAccountById = exports.deleteConfigFileIfEmpty = exports.createEmptyConfigFile = exports.isConfigValid = exports.getConfig = exports.getConfigFilePath = exports.configFileExists = exports.globalConfigFileExists = exports.localConfigFileExists = exports.getLocalConfigFilePathIfExists = exports.getGlobalConfigFilePath = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const findup_sync_1 = __importDefault(require("findup-sync"));
 const config_1 = require("../constants/config");
 const logger_1 = require("../lib/logger");
 const utils_1 = require("./utils");
@@ -14,20 +15,43 @@ const defaultAccountOverride_1 = require("./defaultAccountOverride");
 const environment_1 = require("../lib/environment");
 const HubSpotConfigError_1 = require("../models/HubSpotConfigError");
 const config_2 = require("../constants/config");
+const isDeepEqual_1 = require("../lib/isDeepEqual");
+const path_1 = require("../lib/path");
+const EMPTY_CONFIG = { accounts: [] };
+function getGlobalConfigFilePath() {
+    return config_1.GLOBAL_CONFIG_PATH;
+}
+exports.getGlobalConfigFilePath = getGlobalConfigFilePath;
+function getLocalConfigFilePathIfExists() {
+    return (0, findup_sync_1.default)([
+        config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
+        config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME.replace('.yml', '.yaml'),
+    ], { cwd: (0, path_1.getCwd)() });
+}
+exports.getLocalConfigFilePathIfExists = getLocalConfigFilePathIfExists;
 function localConfigFileExists() {
-    return Boolean((0, utils_1.getLocalConfigFilePath)());
+    return Boolean(getLocalConfigFilePathIfExists());
 }
 exports.localConfigFileExists = localConfigFileExists;
 function globalConfigFileExists() {
-    return fs_extra_1.default.existsSync((0, utils_1.getGlobalConfigFilePath)());
+    return (0, utils_1.doesConfigFileExistAtPath)(getGlobalConfigFilePath());
 }
 exports.globalConfigFileExists = globalConfigFileExists;
+function configFileExists() {
+    try {
+        return (0, utils_1.doesConfigFileExistAtPath)(getConfigFilePath());
+    }
+    catch (error) {
+        return false;
+    }
+}
+exports.configFileExists = configFileExists;
 function getConfigDefaultFilePath() {
-    const globalConfigFilePath = (0, utils_1.getGlobalConfigFilePath)();
-    if (fs_extra_1.default.existsSync(globalConfigFilePath)) {
+    const globalConfigFilePath = getGlobalConfigFilePath();
+    if ((0, utils_1.doesConfigFileExistAtPath)(globalConfigFilePath)) {
         return globalConfigFilePath;
     }
-    const localConfigFilePath = (0, utils_1.getLocalConfigFilePath)();
+    const localConfigFilePath = getLocalConfigFilePathIfExists();
     if (!localConfigFilePath) {
         throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.getDefaultConfigFilePath.error'), config_2.HUBSPOT_CONFIG_ERROR_TYPES.CONFIG_NOT_FOUND, config_1.HUBSPOT_CONFIG_OPERATIONS.READ);
     }
@@ -98,17 +122,28 @@ exports.isConfigValid = isConfigValid;
 function createEmptyConfigFile(useGlobalConfig = false) {
     const { configFilePathFromEnvironment } = (0, utils_1.getConfigPathEnvironmentVariables)();
     const defaultPath = useGlobalConfig
-        ? (0, utils_1.getGlobalConfigFilePath)()
+        ? getGlobalConfigFilePath()
         : (0, utils_1.getLocalConfigDefaultFilePath)();
     const pathToWrite = configFilePathFromEnvironment || defaultPath;
-    (0, utils_1.writeConfigFile)({ accounts: [] }, pathToWrite);
+    (0, utils_1.writeConfigFile)(EMPTY_CONFIG, pathToWrite);
 }
 exports.createEmptyConfigFile = createEmptyConfigFile;
-function deleteConfigFile() {
+function deleteConfigFileIfEmpty() {
     const pathToDelete = getConfigFilePath();
-    fs_extra_1.default.unlinkSync(pathToDelete);
+    try {
+        const config = getConfig();
+        if ((0, isDeepEqual_1.isDeepEqual)(config, EMPTY_CONFIG)) {
+            fs_extra_1.default.unlinkSync(pathToDelete);
+        }
+    }
+    catch (error) {
+        const { message, type } = (0, utils_1.handleConfigFileSystemError)(error, pathToDelete);
+        throw new HubSpotConfigError_1.HubSpotConfigError(message, type, config_1.HUBSPOT_CONFIG_OPERATIONS.DELETE, {
+            cause: error,
+        });
+    }
 }
-exports.deleteConfigFile = deleteConfigFile;
+exports.deleteConfigFileIfEmpty = deleteConfigFileIfEmpty;
 function getConfigAccountById(accountId) {
     const { accounts } = getConfig();
     const account = (0, utils_1.getConfigAccountByIdentifier)(accounts, config_1.ACCOUNT_IDENTIFIERS.ACCOUNT_ID, accountId);
@@ -135,7 +170,9 @@ exports.getConfigAccountIfExists = getConfigAccountIfExists;
 function getConfigDefaultAccount() {
     const { accounts, defaultAccount } = getConfig();
     let defaultAccountToUse = defaultAccount;
-    if (globalConfigFileExists()) {
+    const currentConfigPath = getConfigFilePath();
+    const globalConfigPath = getGlobalConfigFilePath();
+    if (currentConfigPath === globalConfigPath && globalConfigFileExists()) {
         const defaultAccountOverrideAccountId = (0, defaultAccountOverride_1.getDefaultAccountOverrideAccountId)();
         defaultAccountToUse = defaultAccountOverrideAccountId || defaultAccount;
     }
@@ -154,7 +191,10 @@ exports.getConfigDefaultAccount = getConfigDefaultAccount;
 function getConfigDefaultAccountIfExists() {
     const { accounts, defaultAccount } = getConfig();
     let defaultAccountToUse = defaultAccount;
-    if (globalConfigFileExists()) {
+    // Only check for default account override if we're using the global config
+    const currentConfigPath = getConfigFilePath();
+    const globalConfigPath = getGlobalConfigFilePath();
+    if (currentConfigPath === globalConfigPath && globalConfigFileExists()) {
         const defaultAccountOverrideAccountId = (0, defaultAccountOverride_1.getDefaultAccountOverrideAccountId)();
         defaultAccountToUse = defaultAccountOverrideAccountId || defaultAccount;
     }
@@ -171,15 +211,14 @@ function getAllConfigAccounts() {
 }
 exports.getAllConfigAccounts = getAllConfigAccounts;
 function getConfigAccountEnvironment(identifier) {
-    if (identifier) {
-        const config = getConfig();
-        const account = (0, utils_1.getConfigAccountByInferredIdentifier)(config.accounts, identifier);
-        if (account) {
-            return (0, environment_1.getValidEnv)(account.env);
-        }
+    const config = getConfig();
+    const account = (0, utils_1.getConfigAccountByInferredIdentifier)(config.accounts, identifier);
+    if (!account) {
+        throw new HubSpotConfigError_1.HubSpotConfigError((0, lang_1.i18n)('config.getConfigAccountEnvironment.accountNotFound', {
+            identifier,
+        }), config_2.HUBSPOT_CONFIG_ERROR_TYPES.ACCOUNT_NOT_FOUND, config_1.HUBSPOT_CONFIG_OPERATIONS.READ);
     }
-    const defaultAccount = getConfigDefaultAccount();
-    return (0, environment_1.getValidEnv)(defaultAccount.env);
+    return (0, environment_1.getValidEnv)(account.env);
 }
 exports.getConfigAccountEnvironment = getConfigAccountEnvironment;
 function addConfigAccount(accountToAdd) {

package/config/migrate.d.ts

@@ -15,3 +15,4 @@ export declare function mergeConfigAccounts(toConfig: HubSpotConfig, fromConfig:
     configWithMergedAccounts: HubSpotConfig;
     skippedAccountIds: Array<string | number>;
 };
+export declare function archiveConfigAtPath(configPath: string): void;

package/config/migrate.js

@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeConfigAccounts = exports.mergeConfigProperties = exports.migrateConfigAtPath = exports.getConfigAtPath = void 0;
+exports.archiveConfigAtPath = exports.mergeConfigAccounts = exports.mergeConfigProperties = exports.migrateConfigAtPath = exports.getConfigAtPath = void 0;
 const fs_1 = __importDefault(require("fs"));
 const index_1 = require("./index");
 const config_1 = require("../constants/config");
 const utils_1 = require("./utils");
+const path_1 = __importDefault(require("path"));
 function getConfigAtPath(path) {
     const configFileSource = (0, utils_1.readConfigFile)(path);
     return (0, utils_1.parseConfig)(configFileSource, path);
@@ -16,8 +17,7 @@ exports.getConfigAtPath = getConfigAtPath;
 function migrateConfigAtPath(path) {
     (0, index_1.createEmptyConfigFile)(true);
     const configToMigrate = getConfigAtPath(path);
-    (0, utils_1.writeConfigFile)(configToMigrate, (0, utils_1.getGlobalConfigFilePath)());
-    fs_1.default.unlinkSync(path);
+    (0, utils_1.writeConfigFile)(configToMigrate, (0, index_1.getGlobalConfigFilePath)());
 }
 exports.migrateConfigAtPath = migrateConfigAtPath;
 function mergeConfigProperties(toConfig, fromConfig, force) {
@@ -98,7 +98,13 @@ function buildConfigWithMergedAccounts(toConfig, fromConfig) {
 }
 function mergeConfigAccounts(toConfig, fromConfig) {
     const { configWithMergedAccounts, skippedAccountIds } = buildConfigWithMergedAccounts(toConfig, fromConfig);
-    (0, utils_1.writeConfigFile)(configWithMergedAccounts, (0, utils_1.getGlobalConfigFilePath)());
+    (0, utils_1.writeConfigFile)(configWithMergedAccounts, (0, index_1.getGlobalConfigFilePath)());
     return { configWithMergedAccounts, skippedAccountIds };
 }
 exports.mergeConfigAccounts = mergeConfigAccounts;
+function archiveConfigAtPath(configPath) {
+    const dir = path_1.default.dirname(configPath);
+    const archivedConfigPath = path_1.default.join(dir, config_1.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME);
+    fs_1.default.renameSync(configPath, archivedConfigPath);
+}
+exports.archiveConfigAtPath = archiveConfigAtPath;

package/config/state.d.ts

@@ -1,3 +1,3 @@
-import { CLIState } from '../types/Config';
-export declare function getStateValue<K extends keyof CLIState>(key: K): CLIState[K];
-export declare function setStateValue<K extends keyof CLIState>(key: K, value: CLIState[K]): void;
+import { HubSpotState } from '../types/Config';
+export declare function getStateValue<K extends keyof HubSpotState>(key: K): HubSpotState[K];
+export declare function setStateValue<K extends keyof HubSpotState>(key: K, value: HubSpotState[K]): void;

package/config/state.js

@@ -29,9 +29,10 @@ const path = __importStar(require("path"));
 const lang_1 = require("../utils/lang");
 const config_1 = require("../constants/config");
 const logger_1 = require("../lib/logger");
+const config_2 = require("../constants/config");
 const i18nKey = 'config.state';
 const DEFAULT_STATE = {
-    mcpTotalToolCalls: 0,
+    [config_2.MCP_TOTAL_TOOL_CALLS_STATE]: 0,
 };
 function ensureCLIDirectory() {
     try {
@@ -46,19 +47,41 @@ function ensureCLIDirectory() {
         }));
     }
 }
+function sanitizeAndMerge(parsed) {
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+        return structuredClone(DEFAULT_STATE);
+    }
+    const state = parsed;
+    const result = structuredClone(DEFAULT_STATE);
+    for (const key in DEFAULT_STATE) {
+        const typedKey = key;
+        if (key in state &&
+            typeof state[typedKey] === typeof DEFAULT_STATE[typedKey]) {
+            result[typedKey] = state[typedKey];
+        }
+        // keys not in parsed file remain as DEFAULT values
+    }
+    return result;
+}
 function getCurrentState() {
     try {
-        if (fs.existsSync(config_1.STATE_FILE_PATH)) {
-            const data = fs.readFileSync(config_1.STATE_FILE_PATH, 'utf-8');
-            return JSON.parse(data);
+        if (!fs.existsSync(config_1.STATE_FILE_PATH)) {
+            return structuredClone(DEFAULT_STATE);
         }
+        const data = fs.readFileSync(config_1.STATE_FILE_PATH, 'utf-8');
+        if (!data?.trim()) {
+            logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.getCurrentState.debug.emptyStateFile`));
+            return structuredClone(DEFAULT_STATE);
+        }
+        const parsed = JSON.parse(data);
+        return sanitizeAndMerge(parsed);
     }
     catch (error) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.getCurrentState.errors.errorReading`, {
+        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.getCurrentState.errors.errorReading`, {
             error: error instanceof Error ? error.message : String(error),
         }));
+        return structuredClone(DEFAULT_STATE);
     }
-    return DEFAULT_STATE;
 }
 function getStateValue(key) {
     ensureCLIDirectory();
@@ -68,13 +91,7 @@ function getStateValue(key) {
 exports.getStateValue = getStateValue;
 function setStateValue(key, value) {
     ensureCLIDirectory();
-    let currentState = DEFAULT_STATE;
-    try {
-        currentState = getCurrentState();
-    }
-    catch (error) {
-        logger_1.logger.debug(error);
-    }
+    const currentState = getCurrentState();
     const newState = { ...currentState, [key]: value };
     try {
         fs.writeFileSync(config_1.STATE_FILE_PATH, JSON.stringify(newState, null, 2), 'utf-8');

package/config/utils.d.ts

@@ -1,14 +1,13 @@
 import { ACCOUNT_IDENTIFIERS } from '../constants/config';
-import { HubSpotConfig, DeprecatedHubSpotConfigFields } from '../types/Config';
+import { HubSpotConfig, DeprecatedHubSpotConfigFields, HubSpotConfigErrorType } from '../types/Config';
 import { HubSpotConfigAccount, AccountType, TokenInfo } from '../types/Accounts';
 import { ValueOf } from '../types/Utils';
-export declare function getGlobalConfigFilePath(): string;
-export declare function getLocalConfigFilePath(): string | null;
 export declare function getLocalConfigDefaultFilePath(): string;
 export declare function getConfigPathEnvironmentVariables(): {
     useEnvironmentConfig: boolean;
     configFilePathFromEnvironment: string | undefined;
 };
+export declare function doesConfigFileExistAtPath(path: string): boolean;
 export declare function readConfigFile(configPath: string): string;
 export declare function removeUndefinedFieldsFromConfigAccount<T extends HubSpotConfigAccount | Partial<HubSpotConfigAccount> = HubSpotConfigAccount>(account: T): T;
 export declare function formatConfigForWrite(config: HubSpotConfig): {
@@ -72,3 +71,7 @@ export declare function getConfigAccountByIdentifier(accounts: Array<HubSpotConf
 export declare function getConfigAccountByInferredIdentifier(accounts: Array<HubSpotConfigAccount>, accountIdentifier: string | number): HubSpotConfigAccount | undefined;
 export declare function getConfigAccountIndexById(accounts: Array<HubSpotConfigAccount>, id: number): number;
 export declare function isConfigAccountValid(account: Partial<HubSpotConfigAccount>): boolean;
+export declare function handleConfigFileSystemError(error: unknown, path: string): {
+    message?: string;
+    type: HubSpotConfigErrorType;
+};

package/config/utils.js

@@ -3,10 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isConfigAccountValid = exports.getConfigAccountIndexById = exports.getConfigAccountByInferredIdentifier = exports.getConfigAccountByIdentifier = exports.getAccountIdentifierAndType = exports.buildConfigFromEnvironment = exports.parseConfig = exports.normalizeParsedConfig = exports.writeConfigFile = exports.formatConfigForWrite = exports.removeUndefinedFieldsFromConfigAccount = exports.readConfigFile = exports.getConfigPathEnvironmentVariables = exports.getLocalConfigDefaultFilePath = exports.getLocalConfigFilePath = exports.getGlobalConfigFilePath = void 0;
+exports.handleConfigFileSystemError = exports.isConfigAccountValid = exports.getConfigAccountIndexById = exports.getConfigAccountByInferredIdentifier = exports.getConfigAccountByIdentifier = exports.getAccountIdentifierAndType = exports.buildConfigFromEnvironment = exports.parseConfig = exports.normalizeParsedConfig = exports.writeConfigFile = exports.formatConfigForWrite = exports.removeUndefinedFieldsFromConfigAccount = exports.readConfigFile = exports.doesConfigFileExistAtPath = exports.getConfigPathEnvironmentVariables = exports.getLocalConfigDefaultFilePath = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
-const findup_sync_1 = __importDefault(require("findup-sync"));
 const config_1 = require("../constants/config");
 const auth_1 = require("../constants/auth");
 const FileSystemError_1 = require("../models/FileSystemError");
@@ -16,17 +15,6 @@ const path_1 = require("../lib/path");
 const files_1 = require("../constants/files");
 const lang_1 = require("../utils/lang");
 const HubSpotConfigError_1 = require("../models/HubSpotConfigError");
-function getGlobalConfigFilePath() {
-    return config_1.GLOBAL_CONFIG_PATH;
-}
-exports.getGlobalConfigFilePath = getGlobalConfigFilePath;
-function getLocalConfigFilePath() {
-    return (0, findup_sync_1.default)([
-        config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-        config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME.replace('.yml', '.yaml'),
-    ]);
-}
-exports.getLocalConfigFilePath = getLocalConfigFilePath;
 function getLocalConfigDefaultFilePath() {
     return `${(0, path_1.getCwd)()}/${config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME}`;
 }
@@ -44,18 +32,24 @@ function getConfigPathEnvironmentVariables() {
     };
 }
 exports.getConfigPathEnvironmentVariables = getConfigPathEnvironmentVariables;
+function doesConfigFileExistAtPath(path) {
+    try {
+        return fs_extra_1.default.existsSync(path);
+    }
+    catch (error) {
+        const { message, type } = handleConfigFileSystemError(error, path);
+        throw new HubSpotConfigError_1.HubSpotConfigError(message, type, config_1.HUBSPOT_CONFIG_OPERATIONS.READ, { cause: error });
+    }
+}
+exports.doesConfigFileExistAtPath = doesConfigFileExistAtPath;
 function readConfigFile(configPath) {
-    let source = '';
     try {
-        source = fs_extra_1.default.readFileSync(configPath).toString();
+        return fs_extra_1.default.readFileSync(configPath).toString();
     }
     catch (err) {
-        throw new FileSystemError_1.FileSystemError({ cause: err }, {
-            filepath: configPath,
-            operation: 'read',
-        });
+        const { message, type } = handleConfigFileSystemError(err, configPath);
+        throw new HubSpotConfigError_1.HubSpotConfigError(message, type, config_1.HUBSPOT_CONFIG_OPERATIONS.READ, { cause: err });
     }
-    return source;
 }
 exports.readConfigFile = readConfigFile;
 function removeUndefinedFieldsFromConfigAccount(account) {
@@ -111,7 +105,7 @@ function formatConfigForWrite(config) {
 }
 exports.formatConfigForWrite = formatConfigForWrite;
 function writeConfigFile(config, configPath) {
-    const source = js_yaml_1.default.dump(JSON.parse(JSON.stringify(formatConfigForWrite(config), null, 2)));
+    const source = js_yaml_1.default.dump(formatConfigForWrite(config));
     try {
         fs_extra_1.default.ensureFileSync(configPath);
         fs_extra_1.default.writeFileSync(configPath, source);
@@ -136,6 +130,9 @@ function getAccountType(sandboxAccountType) {
     return config_1.HUBSPOT_ACCOUNT_TYPES.STANDARD;
 }
 function normalizeParsedConfig(parsedConfig) {
+    if (!parsedConfig.portals && !parsedConfig.accounts) {
+        parsedConfig.accounts = [];
+    }
     if (parsedConfig.portals) {
         parsedConfig.accounts = parsedConfig.portals.map(account => {
             if (account.portalId) {
@@ -325,3 +322,19 @@ function isConfigAccountValid(account) {
     return valid;
 }
 exports.isConfigAccountValid = isConfigAccountValid;
+function handleConfigFileSystemError(error, path) {
+    let message;
+    let type = config_1.HUBSPOT_CONFIG_ERROR_TYPES.UNKNOWN;
+    if (error instanceof Error && 'code' in error) {
+        if (error.code === 'ENOENT') {
+            message = (0, lang_1.i18n)('config.utils.handleConfigFileSystemError.configNotFoundError', { path });
+            type = config_1.HUBSPOT_CONFIG_ERROR_TYPES.CONFIG_NOT_FOUND;
+        }
+        else if (error.code === 'EACCES') {
+            message = (0, lang_1.i18n)('config.utils.handleConfigFileSystemError.insufficientPermissionsError', { path });
+            type = config_1.HUBSPOT_CONFIG_ERROR_TYPES.INSUFFICIENT_PERMISSIONS;
+        }
+    }
+    return { message, type };
+}
+exports.handleConfigFileSystemError = handleConfigFileSystemError;

package/constants/config.d.ts

@@ -18,6 +18,7 @@ export declare const ALLOW_AUTO_UPDATES = "allowAutoUpdates";
 export declare const DEFAULT_ACCOUNT = "defaultAccount";
 export declare const DEFAULT_PORTAL = "defaultPortal";
 export declare const MIN_HTTP_TIMEOUT = 3000;
+export declare const MCP_TOTAL_TOOL_CALLS_STATE = "mcpTotalToolCalls";
 export declare const HUBSPOT_ACCOUNT_TYPES: {
     readonly DEVELOPMENT_SANDBOX: "DEVELOPMENT_SANDBOX";
     readonly DEVELOPER_TEST: "DEVELOPER_TEST";
@@ -58,14 +59,17 @@ export declare const ACCOUNT_IDENTIFIERS: {
 };
 export declare const HUBSPOT_CONFIG_ERROR_TYPES: {
     readonly CONFIG_NOT_FOUND: "CONFIG_NOT_FOUND";
+    readonly INSUFFICIENT_PERMISSIONS: "INSUFFICIENT_PERMISSIONS";
     readonly ACCOUNT_NOT_FOUND: "ACCOUNT_NOT_FOUND";
     readonly NO_DEFAULT_ACCOUNT: "NO_DEFAULT_ACCOUNT";
     readonly INVALID_ENVIRONMENT_VARIABLES: "ENVIRONMENT_VARIABLES";
     readonly YAML_PARSING: "YAML_PARSING";
     readonly INVALID_ACCOUNT: "INVALID_ACCOUNT";
     readonly INVALID_FIELD: "INVALID_FIELD";
+    readonly UNKNOWN: "UNKNOWN";
 };
 export declare const HUBSPOT_CONFIG_OPERATIONS: {
     readonly READ: "READ";
     readonly WRITE: "WRITE";
+    readonly DELETE: "DELETE";
 };

package/constants/config.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HUBSPOT_CONFIG_OPERATIONS = exports.HUBSPOT_CONFIG_ERROR_TYPES = exports.ACCOUNT_IDENTIFIERS = exports.ENVIRONMENT_VARIABLES = exports.CONFIG_FLAGS = exports.HUBSPOT_ACCOUNT_TYPE_STRINGS = exports.HUBSPOT_ACCOUNT_TYPES = exports.MIN_HTTP_TIMEOUT = exports.DEFAULT_PORTAL = exports.DEFAULT_ACCOUNT = exports.ALLOW_AUTO_UPDATES = exports.AUTO_OPEN_BROWSER = exports.ALLOW_USAGE_TRACKING = exports.HTTP_USE_LOCALHOST = exports.ENV = exports.HTTP_TIMEOUT = exports.DEFAULT_CMS_PUBLISH_MODE = exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND = exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID = exports.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME = exports.STATE_FILE_PATH = exports.GLOBAL_CONFIG_PATH = exports.HUBSPOT_STATE_FILE = exports.HUBSPOT_CONFIGURATION_FILE = exports.HUBSPOT_CONFIGURATION_FOLDER = exports.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME = exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = void 0;
+exports.HUBSPOT_CONFIG_OPERATIONS = exports.HUBSPOT_CONFIG_ERROR_TYPES = exports.ACCOUNT_IDENTIFIERS = exports.ENVIRONMENT_VARIABLES = exports.CONFIG_FLAGS = exports.HUBSPOT_ACCOUNT_TYPE_STRINGS = exports.HUBSPOT_ACCOUNT_TYPES = exports.MCP_TOTAL_TOOL_CALLS_STATE = exports.MIN_HTTP_TIMEOUT = exports.DEFAULT_PORTAL = exports.DEFAULT_ACCOUNT = exports.ALLOW_AUTO_UPDATES = exports.AUTO_OPEN_BROWSER = exports.ALLOW_USAGE_TRACKING = exports.HTTP_USE_LOCALHOST = exports.ENV = exports.HTTP_TIMEOUT = exports.DEFAULT_CMS_PUBLISH_MODE = exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_ACCOUNT_NOT_FOUND = exports.DEFAULT_ACCOUNT_OVERRIDE_ERROR_INVALID_ID = exports.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME = exports.STATE_FILE_PATH = exports.GLOBAL_CONFIG_PATH = exports.HUBSPOT_STATE_FILE = exports.HUBSPOT_CONFIGURATION_FILE = exports.HUBSPOT_CONFIGURATION_FOLDER = exports.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME = exports.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME = void 0;
 const lang_1 = require("../utils/lang");
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
@@ -27,6 +27,7 @@ exports.ALLOW_AUTO_UPDATES = 'allowAutoUpdates';
 exports.DEFAULT_ACCOUNT = 'defaultAccount';
 exports.DEFAULT_PORTAL = 'defaultPortal';
 exports.MIN_HTTP_TIMEOUT = 3000;
+exports.MCP_TOTAL_TOOL_CALLS_STATE = 'mcpTotalToolCalls';
 exports.HUBSPOT_ACCOUNT_TYPES = {
     DEVELOPMENT_SANDBOX: 'DEVELOPMENT_SANDBOX',
     DEVELOPER_TEST: 'DEVELOPER_TEST',
@@ -67,14 +68,17 @@ exports.ACCOUNT_IDENTIFIERS = {
 };
 exports.HUBSPOT_CONFIG_ERROR_TYPES = {
     CONFIG_NOT_FOUND: 'CONFIG_NOT_FOUND',
+    INSUFFICIENT_PERMISSIONS: 'INSUFFICIENT_PERMISSIONS',
     ACCOUNT_NOT_FOUND: 'ACCOUNT_NOT_FOUND',
     NO_DEFAULT_ACCOUNT: 'NO_DEFAULT_ACCOUNT',
     INVALID_ENVIRONMENT_VARIABLES: 'ENVIRONMENT_VARIABLES',
     YAML_PARSING: 'YAML_PARSING',
     INVALID_ACCOUNT: 'INVALID_ACCOUNT',
     INVALID_FIELD: 'INVALID_FIELD',
+    UNKNOWN: 'UNKNOWN',
 };
 exports.HUBSPOT_CONFIG_OPERATIONS = {
     READ: 'READ',
     WRITE: 'WRITE',
+    DELETE: 'DELETE',
 };

package/http/index.js

@@ -42,22 +42,29 @@ const HubSpotHttpError_1 = require("../models/HubSpotHttpError");
 const auth_1 = require("../constants/auth");
 const localDevAuth_1 = require("../api/localDevAuth");
 const util = __importStar(require("util"));
+const trackUsage_1 = require("../lib/trackUsage");
 const i18nKey = 'http.index';
+const IGNORE_URLS_NETWORK_DEBUG = [
+    localDevAuth_1.LOCALDEVAUTH_ACCESS_TOKEN_PATH,
+    trackUsage_1.CMS_CLI_USAGE_PATH,
+    trackUsage_1.VSCODE_USAGE_PATH,
+];
 function logRequest(response) {
     try {
-        if (process.env.HUBSPOT_NETWORK_LOGGING) {
-            if (response.config.url === localDevAuth_1.LOCALDEVAUTH_ACCESS_TOKEN_PATH) {
-                // Don't log access tokens
-                return;
-            }
-            logger_1.logger.debug(util.inspect({
-                method: response.config.method,
-                baseURL: response.config.baseURL,
-                url: response.config.url,
-                data: response.data,
-                status: response.status,
-            }, false, null, true));
+        if (!process.env.HUBSPOT_NETWORK_LOGGING) {
+            return;
+        }
+        if (response?.config?.url &&
+            IGNORE_URLS_NETWORK_DEBUG.includes(response.config.url)) {
+            return;
         }
+        logger_1.logger.debug(util.inspect({
+            method: response.config.method,
+            baseURL: response.config.baseURL,
+            url: response.config.url,
+            data: response.data,
+            status: response.status,
+        }, false, null, true));
     }
     catch (error) {
         // Ignore any errors that occur while logging the response

package/lang/en.json

@@ -291,7 +291,14 @@
     "updateDefaultCmsPublishMode": {
       "invalidCmsPublishMode": "Error updating config default CMS publish mode: CMS publish can only be set to 'draft' or 'publish'"
     },
+    "getConfigAccountEnvironment": {
+      "accountNotFound": "Attempted to get environment for account with identifier {{ identifier }}, but that account was not found in config"
+    },
     "utils": {
+      "handleConfigFileSystemError": {
+        "configNotFoundError": "No config file found at {{ path }}.",
+        "insufficientPermissionsError": "Insufficient permissions to access config file at {{ path }}"
+      },
       "isConfigAccountValid": {
         "missingAccount": "Invalid config: at least one account in config is missing data",
         "missingAuthType": "Invalid config: account {{ accountId }} has no authType",
@@ -344,6 +351,9 @@
         }
       },
       "getCurrentState": {
+        "debug": {
+          "emptyStateFile": "State file is empty, using default state"
+        },
         "errors": {
           "errorReading": "Error reading CLI state, using defaults: {{ error }}"
         }
@@ -379,7 +389,7 @@
       }
     },
     "HubSpotConfigError": {
-      "baseMessage": "An error occurred while {{ operation }} your HubSpot config {{ configType }}: {{ message }}"
+      "baseMessage": "An error occurred while {{ operation }} your HubSpot config {{ configType }}{{ message }}"
     }
   },
   "utils": {

package/lib/personalAccessKey.js

@@ -121,10 +121,8 @@ async function authorizedScopesForPortalAndUser(accountId) {
 exports.authorizedScopesForPortalAndUser = authorizedScopesForPortalAndUser;
 async function updateConfigWithAccessToken(token, personalAccessKey, env, name, makeDefault = false) {
     const { portalId, accessToken, expiresAt, accountType } = token;
-    const account = name
-        ? (0, config_1.getConfigAccountByName)(name)
-        : (0, config_1.getConfigDefaultAccount)();
-    const accountEnv = env || account.env;
+    const account = (0, config_1.getConfigAccountIfExists)(portalId);
+    const accountEnv = env || account?.env || environments_1.ENVIRONMENTS.PROD;
     let parentAccountId;
     try {
         if (accountType === config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
@@ -161,15 +159,21 @@ async function updateConfigWithAccessToken(token, personalAccessKey, env, name,
         accountId: portalId,
         accountType,
         personalAccessKey,
-        name: name || account.name,
+        name: name || account?.name || token.hubName,
         authType: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
         auth: { tokenInfo: { accessToken, expiresAt } },
         parentAccountId,
         env: accountEnv,
     };
-    (0, config_1.updateConfigAccount)(updatedAccount);
-    if (makeDefault && name) {
-        (0, config_1.setConfigAccountAsDefault)(name);
+    // Add new account if it doesn't exist, otherwise update existing account
+    if (account) {
+        (0, config_1.updateConfigAccount)(updatedAccount);
+    }
+    else {
+        (0, config_1.addConfigAccount)(updatedAccount);
+    }
+    if (makeDefault) {
+        (0, config_1.setConfigAccountAsDefault)(updatedAccount.accountId);
     }
     return updatedAccount;
 }

package/lib/portManager.js

@@ -7,11 +7,10 @@ exports.portManagerHasActiveServers = exports.deleteServerInstance = exports.get
 const axios_1 = __importDefault(require("axios"));
 const PortManagerServer_1 = require("../utils/PortManagerServer");
 const ports_1 = require("../constants/ports");
-const detectPort_1 = require("../utils/detectPort");
 const logger_1 = require("./logger");
 exports.BASE_URL = `http://localhost:${ports_1.PORT_MANAGER_SERVER_PORT}`;
 async function isPortManagerPortAvailable() {
-    return ((await (0, detectPort_1.detectPort)(ports_1.PORT_MANAGER_SERVER_PORT)) === ports_1.PORT_MANAGER_SERVER_PORT);
+    return PortManagerServer_1.PortManagerServer.portAvailable();
 }
 exports.isPortManagerPortAvailable = isPortManagerPortAvailable;
 async function isPortManagerServerRunning() {

package/lib/trackUsage.d.ts

@@ -1 +1,3 @@
+export declare const CMS_CLI_USAGE_PATH: string;
+export declare const VSCODE_USAGE_PATH: string;
 export declare function trackUsage(eventName: string, eventClass: string, meta?: {}, accountId?: number): Promise<void>;

package/lib/trackUsage.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.trackUsage = void 0;
+exports.trackUsage = exports.VSCODE_USAGE_PATH = exports.CMS_CLI_USAGE_PATH = void 0;
 const axios_1 = __importDefault(require("axios"));
 const getAxiosConfig_1 = require("../http/getAxiosConfig");
 const logger_1 = require("./logger");
@@ -13,6 +13,8 @@ const fileMapper_1 = require("../api/fileMapper");
 const lang_1 = require("../utils/lang");
 const environment_1 = require("./environment");
 const i18nKey = 'lib.trackUsage';
+exports.CMS_CLI_USAGE_PATH = `${fileMapper_1.FILE_MAPPER_API_PATH}/cms-cli-usage`;
+exports.VSCODE_USAGE_PATH = `${fileMapper_1.FILE_MAPPER_API_PATH}/vscode-extension-usage`;
 async function trackUsage(eventName, eventClass, meta = {}, accountId) {
     const usageEvent = {
         accountId,
@@ -24,18 +26,17 @@ async function trackUsage(eventName, eventClass, meta = {}, accountId) {
         VSCODE_EXTENSION_INTERACTION: 'vscode-extension-interaction',
         CLI_INTERACTION: 'cli-interaction',
     };
-    let analyticsEndpoint;
+    let path = fileMapper_1.FILE_MAPPER_API_PATH;
     switch (eventName) {
         case EVENT_TYPES.CLI_INTERACTION:
-            analyticsEndpoint = 'cms-cli-usage';
+            path = exports.CMS_CLI_USAGE_PATH;
             break;
         case EVENT_TYPES.VSCODE_EXTENSION_INTERACTION:
-            analyticsEndpoint = 'vscode-extension-usage';
+            path = exports.VSCODE_USAGE_PATH;
             break;
         default:
             logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.invalidEvent`, { eventName }));
     }
-    const path = `${fileMapper_1.FILE_MAPPER_API_PATH}/${analyticsEndpoint}`;
     const account = accountId && (0, config_1.getConfigAccountById)(accountId);
     if (account && account.authType === 'personalaccesskey') {
         logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.sendingEventAuthenticated`));

package/models/HubSpotConfigError.d.ts

@@ -2,5 +2,5 @@ import { HubSpotConfigErrorType, HubSpotConfigOperation } from '../types/Config'
 export declare class HubSpotConfigError extends Error {
     type: HubSpotConfigErrorType;
     operation: HubSpotConfigOperation;
-    constructor(message: string, type: HubSpotConfigErrorType, operation: HubSpotConfigOperation, options?: ErrorOptions);
+    constructor(message: string | undefined, type: HubSpotConfigErrorType, operation: HubSpotConfigOperation, options?: ErrorOptions);
 }

package/models/HubSpotConfigError.js

@@ -4,6 +4,11 @@ exports.HubSpotConfigError = void 0;
 const config_1 = require("../constants/config");
 const lang_1 = require("../utils/lang");
 const NAME = 'HubSpotConfigError';
+const OPERATION_TEXT = {
+    [config_1.HUBSPOT_CONFIG_OPERATIONS.READ]: 'reading',
+    [config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE]: 'writing to',
+    [config_1.HUBSPOT_CONFIG_OPERATIONS.DELETE]: 'deleting',
+};
 function isEnvironmentError(type) {
     return type === config_1.HUBSPOT_CONFIG_ERROR_TYPES.INVALID_ENVIRONMENT_VARIABLES;
 }
@@ -14,10 +19,10 @@ class HubSpotConfigError extends Error {
         const configType = isEnvironmentError(type)
             ? 'environment variables'
             : 'file';
-        const operationText = operation === config_1.HUBSPOT_CONFIG_OPERATIONS.WRITE ? 'writing to' : 'reading';
+        const operationText = OPERATION_TEXT[operation];
         const withBaseMessage = (0, lang_1.i18n)('models.HubSpotConfigError.baseMessage', {
             configType,
-            message,
+            message: message ? `: ${message}` : '',
             operation: operationText,
         });
         super(withBaseMessage, options);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "0.5.0-experimental.1",
+    "version": "0.5.0-experimental.11",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "repository": {
         "type": "git",
@@ -21,7 +21,6 @@
     "license": "Apache-2.0",
     "devDependencies": {
         "@hubspot/npm-scripts": "0.0.4",
-        "@inquirer/prompts": "^7.0.1",
         "@types/content-disposition": "^0.5.5",
         "@types/cors": "^2.8.15",
         "@types/debounce": "^1.2.1",

package/types/Config.d.ts

@@ -29,7 +29,7 @@ export type GitInclusionResult = {
     gitignoreFiles: Array<string>;
 };
 export type ConfigFlag = ValueOf<typeof CONFIG_FLAGS>;
-export type CLIState = {
+export type HubSpotState = {
     mcpTotalToolCalls: number;
 };
 export type HubSpotConfigErrorType = ValueOf<typeof HUBSPOT_CONFIG_ERROR_TYPES>;

package/utils/PortManagerServer.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import { Express, Request, Response } from 'express';
+import { Express } from 'express';
 import { Server } from 'http';
-import { RequestPortsData, ServerPortMap } from '../types/PortManager';
+import { ServerPortMap } from '../types/PortManager';
 export declare const HEALTH_CHECK_PATH = "/port-manager-health-check";
 export declare const SERVICE_HEALTHY = "OK";
 declare class _PortManagerServer {
@@ -10,19 +10,18 @@ declare class _PortManagerServer {
     serverPortMap: ServerPortMap;
     constructor();
     init(): Promise<void>;
-    reset(): void;
-    listen(): Promise<Server>;
-    setupRoutes(): void;
-    setPort(instanceId: string, port: number): void;
-    deletePort(instanceId: string): void;
-    send404(res: Response, instanceId: string): void;
-    getServers: (req: Request, res: Response) => Promise<void>;
-    getServerPortByInstanceId: (req: Request, res: Response) => void;
-    assignPortsToServers: (req: Request<never, never, {
-        portData: Array<RequestPortsData>;
-    }>, res: Response) => Promise<void>;
-    deleteServerInstance: (req: Request, res: Response) => void;
-    closeServer: (req: Request, res: Response) => void;
+    private reset;
+    portAvailable(): Promise<boolean>;
+    private listen;
+    private setupRoutes;
+    private setPort;
+    private deletePort;
+    private send404;
+    private getServers;
+    private getServerPortByInstanceId;
+    private assignPortsToServers;
+    private deleteServerInstance;
+    private closeServer;
 }
 export declare const PortManagerServer: _PortManagerServer;
 export {};

package/utils/PortManagerServer.js

@@ -8,7 +8,6 @@ const express_1 = __importDefault(require("express"));
 const cors_1 = __importDefault(require("cors"));
 const detectPort_1 = require("./detectPort");
 const ports_1 = require("../constants/ports");
-const errors_1 = require("../errors");
 const logger_1 = require("../lib/logger");
 const lang_1 = require("./lang");
 const i18nKey = 'utils.PortManagerServer';
@@ -22,6 +21,11 @@ class _PortManagerServer {
         this.serverPortMap = {};
     }
     async init() {
+        if (!(await this.portAvailable())) {
+            throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.portInUse`, {
+                port: ports_1.PORT_MANAGER_SERVER_PORT,
+            }));
+        }
         if (this.app) {
             throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.duplicateInstance`));
         }
@@ -29,24 +33,17 @@ class _PortManagerServer {
         this.app.use(express_1.default.json());
         this.app.use((0, cors_1.default)());
         this.setupRoutes();
-        try {
-            this.server = await this.listen();
-            logger_1.logger.debug(this.server);
-        }
-        catch (e) {
-            if ((0, errors_1.isSystemError)(e) && e.code === 'EADDRINUSE') {
-                throw new Error((0, lang_1.i18n)(`${i18nKey}.errors.portInUse`, {
-                    port: ports_1.PORT_MANAGER_SERVER_PORT,
-                }), { cause: e });
-            }
-            throw e;
-        }
+        this.server = await this.listen();
+        logger_1.logger.debug(this.server);
     }
     reset() {
         this.app = undefined;
         this.server = undefined;
         this.serverPortMap = {};
     }
+    async portAvailable() {
+        return ((await (0, detectPort_1.detectPort)(ports_1.PORT_MANAGER_SERVER_PORT)) === ports_1.PORT_MANAGER_SERVER_PORT);
+    }
     listen() {
         return new Promise((resolve, reject) => {
             const server = this.app.listen(ports_1.PORT_MANAGER_SERVER_PORT, () => {