@contentstack/cli-utilities 2.0.0-beta.1 → 2.0.0-beta.10

package/lib/auth-handler.d.ts

@@ -23,7 +23,10 @@ declare class AuthHandler {
     private allAuthConfigItems;
     private oauthHandler;
     private managementAPIClient;
+    /** True while an OAuth access-token refresh is running (for logging/diagnostics; correctness uses `oauthRefreshInFlight`). */
     private isRefreshingToken;
+    /** Serialize OAuth refresh so concurrent API calls await the same refresh instead of proceeding with a stale token. */
+    private oauthRefreshInFlight;
     private cmaHost;
     set host(contentStackHost: any);
     constructor();
@@ -45,8 +48,8 @@ declare class AuthHandler {
     getAuthorisationType(): Promise<any>;
     isAuthorisationTypeBasic(): Promise<boolean>;
     isAuthorisationTypeOAuth(): Promise<boolean>;
-    checkExpiryAndRefresh: (force?: boolean) => Promise<void | object>;
-    compareOAuthExpiry(force?: boolean): Promise<void | object>;
+    checkExpiryAndRefresh: (force?: boolean) => Promise<void>;
+    compareOAuthExpiry(force?: boolean): Promise<void>;
     restoreOAuthConfig(): void;
 }
 declare const _default: AuthHandler;

package/lib/auth-handler.js

@@ -22,7 +22,10 @@ class AuthHandler {
         this.cmaHost = this.getCmaHost();
     }
     constructor() {
+        /** True while an OAuth access-token refresh is running (for logging/diagnostics; correctness uses `oauthRefreshInFlight`). */
         this.isRefreshingToken = false; // Flag to track if a refresh operation is in progress
+        /** Serialize OAuth refresh so concurrent API calls await the same refresh instead of proceeding with a stale token. */
+        this.oauthRefreshInFlight = null;
         this.checkExpiryAndRefresh = (force = false) => this.compareOAuthExpiry(force);
         this.OAuthAppId = process.env.OAUTH_APP_ID || '6400aa06db64de001a31c8a9';
         this.OAuthClientId = process.env.OAUTH_CLIENT_ID || 'Ie0FEfTzlfAHL4xM';
@@ -329,44 +332,41 @@ class AuthHandler {
         return config_handler_1.default.get(this.authorisationTypeKeyName) === this.authorisationTypeOAUTHValue ? true : false;
     }
     async compareOAuthExpiry(force = false) {
-        // Avoid recursive refresh operations
-        if (this.isRefreshingToken) {
-            cli_ux_1.default.print('Refresh operation already in progress');
-            return Promise.resolve();
-        }
         const oauthDateTime = config_handler_1.default.get(this.oauthDateTimeKeyName);
         const authorisationType = config_handler_1.default.get(this.authorisationTypeKeyName);
         if (oauthDateTime && authorisationType === this.authorisationTypeOAUTHValue) {
             const now = new Date();
             const oauthDate = new Date(oauthDateTime);
-            const oauthValidUpto = new Date();
-            oauthValidUpto.setTime(oauthDate.getTime() + 59 * 60 * 1000);
-            if (force) {
-                cli_ux_1.default.print('Forcing token refresh...');
-                return this.refreshToken();
+            const oauthValidUpto = new Date(oauthDate.getTime() + 59 * 60 * 1000);
+            const tokenExpired = oauthValidUpto <= now;
+            const shouldRefresh = force || tokenExpired;
+            if (!shouldRefresh) {
+                return Promise.resolve();
             }
-            else {
-                if (oauthValidUpto > now) {
-                    return Promise.resolve();
-                }
-                else {
-                    cli_ux_1.default.print('Token expired, refreshing the token');
-                    // Set the flag before refreshing the token
-                    this.isRefreshingToken = true;
-                    try {
-                        await this.refreshToken();
-                    }
-                    catch (error) {
-                        cli_ux_1.default.error('Error refreshing token');
-                        throw error;
+            if (this.oauthRefreshInFlight) {
+                return this.oauthRefreshInFlight;
+            }
+            this.isRefreshingToken = true;
+            this.oauthRefreshInFlight = (async () => {
+                try {
+                    if (force) {
+                        cli_ux_1.default.print('Forcing token refresh...');
                     }
-                    finally {
-                        // Reset the flag after refresh operation is completed
-                        this.isRefreshingToken = false;
+                    else {
+                        cli_ux_1.default.print('Token expired, refreshing the token');
                     }
-                    return Promise.resolve();
+                    await this.refreshToken();
                 }
-            }
+                catch (error) {
+                    cli_ux_1.default.error('Error refreshing token');
+                    throw error;
+                }
+                finally {
+                    this.isRefreshingToken = false;
+                    this.oauthRefreshInFlight = null;
+                }
+            })();
+            return this.oauthRefreshInFlight;
         }
         else {
             cli_ux_1.default.print('No OAuth configuration set.');

package/lib/chalk.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Chalk 5 is ESM-only. We load it via dynamic import and cache for use in CommonJS.
+ *
+ * More than one physical copy of this package can load in one process (e.g. pnpm).
+ * Cache on globalThis via Symbol.for so loadChalk() from any copy warms getChalk() for all.
+ */
+export type ChalkInstance = typeof import('chalk').default;
+/**
+ * Load chalk (ESM) and cache it. Call this once during CLI init before any chalk usage.
+ */
+export declare function loadChalk(): Promise<ChalkInstance>;
+/**
+ * Get the cached chalk instance. Must call loadChalk() first (e.g. in init hook).
+ */
+export declare function getChalk(): ChalkInstance;

package/lib/chalk.js

@@ -0,0 +1,66 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadChalk = loadChalk;
+exports.getChalk = getChalk;
+const chalkGlobal = Symbol.for('@contentstack/cli-utilities/chalk');
+function readCached() {
+    return globalThis[chalkGlobal];
+}
+function writeCached(chalkInstance) {
+    globalThis[chalkGlobal] = chalkInstance;
+}
+/**
+ * Load chalk (ESM) and cache it. Call this once during CLI init before any chalk usage.
+ */
+async function loadChalk() {
+    let chalkInstance = readCached();
+    if (!chalkInstance) {
+        const chalkModule = await Promise.resolve().then(() => __importStar(require('chalk')));
+        chalkInstance = chalkModule.default;
+        writeCached(chalkInstance);
+    }
+    return chalkInstance;
+}
+/**
+ * Get the cached chalk instance. Must call loadChalk() first (e.g. in init hook).
+ */
+function getChalk() {
+    const chalkInstance = readCached();
+    if (!chalkInstance) {
+        throw new Error('Chalk not loaded. Ensure loadChalk() is called during init (e.g. in utils-init hook).');
+    }
+    return chalkInstance;
+}

package/lib/cli-ux.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Command = exports.Args = exports.Flags = void 0;
 const tslib_1 = require("tslib");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const chalk_1 = require("./chalk");
 const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const core_1 = require("@oclif/core");
 Object.defineProperty(exports, "Args", { enumerable: true, get: function () { return core_1.Args; } });
@@ -27,7 +27,8 @@ class CLIInterface {
     }
     print(message, opts) {
         if (opts) {
-            let chalkFn = chalk_1.default;
+            const chalk = (0, chalk_1.getChalk)();
+            let chalkFn = chalk;
             if (opts.color)
                 chalkFn = chalkFn[opts.color];
             if (opts.bold)
@@ -38,10 +39,10 @@ class CLIInterface {
         core_1.ux.stdout(message_handler_1.default.parse(message));
     }
     success(message) {
-        core_1.ux.stdout(chalk_1.default.green(message_handler_1.default.parse(message)));
+        core_1.ux.stdout((0, chalk_1.getChalk)().green(message_handler_1.default.parse(message)));
     }
     error(message, ...params) {
-        core_1.ux.stdout(chalk_1.default.red(message_handler_1.default.parse(message) + (params && params.length > 0 ? ': ' : '')), ...params);
+        core_1.ux.stdout((0, chalk_1.getChalk)().red(message_handler_1.default.parse(message) + (params && params.length > 0 ? ': ' : '')), ...params);
     }
     loader(message = '') {
         if (!this.loading) {
@@ -56,13 +57,25 @@ class CLIInterface {
         cli_table_1.default.render(headers, data, flags, options);
     }
     async inquire(inquirePayload) {
-        if (Array.isArray(inquirePayload)) {
-            return inquirer_1.default.prompt(inquirePayload);
+        var _a, _b;
+        try {
+            if (Array.isArray(inquirePayload)) {
+                return (await inquirer_1.default.prompt(inquirePayload));
+            }
+            else {
+                inquirePayload.message = message_handler_1.default.parse(inquirePayload.message);
+                const result = (await inquirer_1.default.prompt(inquirePayload));
+                return result[inquirePayload.name];
+            }
         }
-        else {
-            inquirePayload.message = message_handler_1.default.parse(inquirePayload.message);
-            const result = await inquirer_1.default.prompt(inquirePayload);
-            return result[inquirePayload.name];
+        catch (err) {
+            const isExitPrompt = (err === null || err === void 0 ? void 0 : err.name) === 'ExitPromptError' ||
+                ((_a = err === null || err === void 0 ? void 0 : err.message) === null || _a === void 0 ? void 0 : _a.includes('SIGINT')) ||
+                ((_b = err === null || err === void 0 ? void 0 : err.message) === null || _b === void 0 ? void 0 : _b.includes('force closed'));
+            if (isExitPrompt) {
+                process.exit(130);
+            }
+            throw err;
         }
     }
     async prompt(message, options) {

package/lib/config-handler.js

@@ -5,7 +5,7 @@ const conf_1 = tslib_1.__importDefault(require("conf"));
 const has_1 = tslib_1.__importDefault(require("lodash/has"));
 const uuid_1 = require("uuid");
 const fs_1 = require("fs");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const chalk_1 = require("./chalk");
 const _1 = require(".");
 const ENC_KEY = process.env.ENC_KEY || 'encryptionKey';
 const ENCRYPT_CONF = (0, has_1.default)(process.env, 'ENCRYPT_CONF') ? process.env.ENCRYPT_CONF === 'true' : true;
@@ -77,7 +77,7 @@ class Config {
     }
     safeDeleteConfigIfInvalid(configFilePath) {
         if ((0, fs_1.existsSync)(configFilePath) && !this.isConfigFileValid(configFilePath)) {
-            console.warn(chalk_1.default.yellow(`Warning: Detected corrupted config at ${configFilePath}. Removing...`));
+            console.warn((0, chalk_1.getChalk)().yellow(`Warning: Detected corrupted config at ${configFilePath}. Removing...`));
             (0, fs_1.unlinkSync)(configFilePath);
         }
     }
@@ -137,7 +137,7 @@ class Config {
                     this.getEncryptedConfig(oldConfigData, true);
                 }
                 catch (_error) {
-                    _1.cliux.print(chalk_1.default.red('Error: Config file is corrupted'));
+                    _1.cliux.print((0, chalk_1.getChalk)().red('Error: Config file is corrupted'));
                     _1.cliux.print(_error);
                     process.exit(1);
                 }
@@ -188,7 +188,7 @@ class Config {
                 }
                 catch (__error) {
                     // console.trace(error.message)
-                    _1.cliux.print(chalk_1.default.red('Error: Config file is corrupted'));
+                    _1.cliux.print((0, chalk_1.getChalk)().red('Error: Config file is corrupted'));
                     _1.cliux.print(_error);
                     process.exit(1);
                 }

package/lib/constants/logging.js

@@ -5,7 +5,7 @@ exports.logLevels = {
     error: 0,
     warn: 1,
     info: 2,
-    success: 2,
+    success: 2, // Maps to info level but with different type
     debug: 3,
     verbose: 4,
 };
@@ -13,7 +13,7 @@ exports.logLevels = {
 exports.levelColors = {
     error: 'red',
     warn: 'yellow',
-    success: 'green',
+    success: 'green', // Custom color for success
     info: 'white',
     debug: 'blue',
 };

package/lib/content-type-utils.d.ts

@@ -2,6 +2,6 @@
  * Reads all content type schema files from a directory
  * @param dirPath - Path to content types directory
  * @param ignoredFiles - Files to ignore (defaults to schema.json, .DS_Store, __master.json, __priority.json)
- * @returns Array of content type schemas
+ * @returns Array of content type schemas (empty if the path is missing or has no eligible files)
  */
-export declare function readContentTypeSchemas(dirPath: string, ignoredFiles?: string[]): Record<string, unknown>[] | null;
+export declare function readContentTypeSchemas(dirPath: string, ignoredFiles?: string[]): Record<string, unknown>[];

package/lib/content-type-utils.js

@@ -1,19 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readContentTypeSchemas = void 0;
+exports.readContentTypeSchemas = readContentTypeSchemas;
+const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
-const fs_utility_1 = require("./fs-utility");
 /**
  * Reads all content type schema files from a directory
  * @param dirPath - Path to content types directory
  * @param ignoredFiles - Files to ignore (defaults to schema.json, .DS_Store, __master.json, __priority.json)
- * @returns Array of content type schemas
+ * @returns Array of content type schemas (empty if the path is missing or has no eligible files)
  */
 function readContentTypeSchemas(dirPath, ignoredFiles = ['schema.json', '.DS_Store', '__master.json', '__priority.json', 'field_rules_uid.json']) {
-    const fsUtil = new fs_utility_1.FsUtility();
-    const files = fsUtil.readdir(dirPath);
+    if (!(0, node_fs_1.existsSync)(dirPath)) {
+        return [];
+    }
+    const files = (0, node_fs_1.readdirSync)(dirPath);
     if (!files || files.length === 0) {
-        return null;
+        return [];
     }
     const contentTypes = [];
     for (const file of files) {
@@ -27,7 +29,8 @@ function readContentTypeSchemas(dirPath, ignoredFiles = ['schema.json', '.DS_Sto
         }
         try {
             const filePath = (0, node_path_1.resolve)(dirPath, file);
-            const contentType = fsUtil.readFile(filePath);
+            const raw = (0, node_fs_1.readFileSync)(filePath, 'utf8');
+            const contentType = JSON.parse(raw);
             if (contentType) {
                 contentTypes.push(contentType);
             }
@@ -39,4 +42,3 @@ function readContentTypeSchemas(dirPath, ignoredFiles = ['schema.json', '.DS_Sto
     }
     return contentTypes;
 }
-exports.readContentTypeSchemas = readContentTypeSchemas;

package/lib/contentstack-management-sdk.js

@@ -15,15 +15,21 @@ class ManagementSDKInitiator {
         this.analyticsInfo = context === null || context === void 0 ? void 0 : context.analyticsInfo;
     }
     async createAPIClient(config) {
-        // Get proxy configuration with priority: Environment variables > Global config
-        const proxyConfig = (0, proxy_helper_1.getProxyConfig)();
+        // Resolve host so NO_PROXY applies even when config.host is omitted (e.g. from region.cma)
+        const host = (0, proxy_helper_1.resolveRequestHost)(config);
+        // NO_PROXY has priority over HTTP_PROXY/HTTPS_PROXY and config-set proxy
+        const proxyConfig = (0, proxy_helper_1.getProxyConfigForHost)(host);
+        // When NO_PROXY matches, strip proxy env so SDK/axios cannot pick up HTTP_PROXY for this process.
+        if (host && (0, proxy_helper_1.shouldBypassProxy)(host)) {
+            (0, proxy_helper_1.clearProxyEnv)();
+        }
         const option = {
-            host: config.host,
+            host: config.host || host || undefined,
             maxContentLength: config.maxContentLength || 100000000,
             maxBodyLength: config.maxBodyLength || 1000000000,
             maxRequests: 10,
             retryLimit: 3,
-            timeout: proxyConfig ? 10000 : 60000,
+            timeout: proxyConfig ? 10000 : 60000, // 10s timeout with proxy, 60s without
             delayMs: config.delayMs,
             httpsAgent: new node_https_1.Agent({
                 maxSockets: 100,
@@ -106,6 +112,10 @@ class ManagementSDKInitiator {
         if (proxyConfig) {
             option.proxy = proxyConfig;
         }
+        else if (host && (0, proxy_helper_1.shouldBypassProxy)(host)) {
+            option.proxy = false;
+        }
+        // When host is in NO_PROXY, do not add proxy to option at all
         if (config.endpoint) {
             option.endpoint = config.endpoint;
         }

package/lib/contentstack-marketplace-sdk.d.ts

@@ -1,6 +1,6 @@
-import { App, AppData } from '@contentstack/marketplace-sdk/types/marketplace/app';
+import type { App, AppData } from '@contentstack/marketplace-sdk/types/marketplace/app';
 import { ContentstackConfig, ContentstackClient, ContentstackToken } from '@contentstack/marketplace-sdk';
-import { Installation } from '@contentstack/marketplace-sdk/types/marketplace/installation';
+import type { Installation } from '@contentstack/marketplace-sdk/types/marketplace/installation';
 type ConfigType = Pick<ContentstackConfig, 'host' | 'endpoint' | 'retryDelay' | 'retryLimit'> & {
     skipTokenValidity?: string;
 };

package/lib/contentstack-marketplace-sdk.js

@@ -23,7 +23,7 @@ class MarketplaceSDKInitiator {
             maxContentLength: 100000000,
             maxBodyLength: 1000000000,
             httpsAgent: new node_https_1.Agent({
-                timeout: 60000,
+                timeout: 60000, // active socket keepalive for 60 seconds
                 maxSockets: 100,
                 keepAlive: true,
                 maxFreeSockets: 10,

package/lib/fs-utility/core.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Chunk, PageInfo, WriteFileOptions, FsConstructorOptions, ChunkFilesGetterType } from './types';
 export default class FsUtility {
     private isArray;

package/lib/fs-utility/core.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFileList = exports.getDirectories = void 0;
+exports.getDirectories = getDirectories;
+exports.getFileList = getFileList;
 const tslib_1 = require("tslib");
 const mkdirp_1 = tslib_1.__importDefault(require("mkdirp"));
 const keys_1 = tslib_1.__importDefault(require("lodash/keys"));
@@ -336,11 +337,9 @@ class FsUtility {
             this.pageInfo.after = index || 0;
             this.pageInfo.before = 1;
         }
-        /* eslint-disable unicorn/consistent-destructuring */
         if (!(0, isEmpty_1.default)(this.readIndexer[this.pageInfo.after + 1])) {
             this.pageInfo.hasNextPage = true;
         }
-        /* eslint-disable unicorn/consistent-destructuring */
         if (!(0, isEmpty_1.default)(this.readIndexer[this.pageInfo.after - 1])) {
             this.pageInfo.hasPreviousPage = true;
         }
@@ -358,7 +357,6 @@ function getDirectories(source) {
         .filter((dirent) => dirent.isDirectory())
         .map((dirent) => dirent.name);
 }
-exports.getDirectories = getDirectories;
 async function getFileList(dirName, onlyName = true) {
     if (!(0, node_fs_1.existsSync)(dirName))
         return [];
@@ -366,7 +364,6 @@ async function getFileList(dirName, onlyName = true) {
     const items = (0, node_fs_1.readdirSync)(dirName, { withFileTypes: true });
     for (const item of items) {
         if (item.isDirectory()) {
-            /* eslint-disable no-await-in-loop */
             files = [...files, ...(await getFileList(`${dirName}/${item.name}`))];
         }
         else {
@@ -375,4 +372,3 @@ async function getFileList(dirName, onlyName = true) {
     }
     return files;
 }
-exports.getFileList = getFileList;

package/lib/fs-utility/helper.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMetaData = exports.mapKeyAndVal = void 0;
+exports.mapKeyAndVal = mapKeyAndVal;
+exports.getMetaData = getMetaData;
 const tslib_1 = require("tslib");
 const map_1 = tslib_1.__importDefault(require("lodash/map"));
 const omit_1 = tslib_1.__importDefault(require("lodash/omit"));
@@ -22,7 +23,6 @@ function mapKeyAndVal(array, keyName, omitKeys = []) {
         return { [row[keyName]]: (0, omit_1.default)(row, omitKeys) };
     }));
 }
-exports.mapKeyAndVal = mapKeyAndVal;
 function getMetaData(array, pickKeys, handler) {
     if (handler instanceof Function)
         handler(array);
@@ -30,4 +30,3 @@ function getMetaData(array, pickKeys, handler) {
         return;
     return (0, map_1.default)(array, (row) => (0, pick_1.default)(row, pickKeys));
 }
-exports.getMetaData = getMetaData;

package/lib/helpers.d.ts

@@ -1,7 +1,7 @@
 import { ContentstackClient } from '.';
 export declare const isAuthenticated: () => boolean;
 export declare const doesBranchExist: (stack: any, branchName: any) => Promise<any>;
-export declare const getBranchFromAlias: (stack: ReturnType<ContentstackClient['stack']>, branchAlias: string) => Promise<string>;
+export declare const getBranchFromAlias: (stack: ReturnType<ContentstackClient["stack"]>, branchAlias: string) => Promise<string>;
 export declare const isManagementTokenValid: (stackAPIKey: any, managementToken: any) => Promise<{
     valid: boolean;
     message?: undefined;
@@ -43,6 +43,8 @@ export declare function getAuthenticationMethod(): string;
  * @param authenticationMethod - Optional authentication method
  * @returns Context object with all session-level metadata
  */
+export declare function generateUid(): string;
+export declare function generateShortUid(): string;
 export declare function createLogContext(commandId: string, apiKey: string, authenticationMethod?: string): {
     command: string;
     module: string;

package/lib/helpers.js

@@ -1,9 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLogContext = exports.getAuthenticationMethod = exports.clearProgressModuleSetting = exports.redactObject = exports.formatError = exports.validateRegex = exports.validateFileName = exports.validateUids = exports.sanitizePath = exports.escapeRegExp = exports.validatePath = exports.createDeveloperHubUrl = exports.isManagementTokenValid = exports.getBranchFromAlias = exports.doesBranchExist = exports.isAuthenticated = void 0;
+exports.redactObject = exports.formatError = exports.validateRegex = exports.validateFileName = exports.validateUids = exports.sanitizePath = exports.escapeRegExp = exports.validatePath = exports.createDeveloperHubUrl = exports.isManagementTokenValid = exports.getBranchFromAlias = exports.doesBranchExist = exports.isAuthenticated = void 0;
+exports.clearProgressModuleSetting = clearProgressModuleSetting;
+exports.getAuthenticationMethod = getAuthenticationMethod;
+exports.generateUid = generateUid;
+exports.generateShortUid = generateShortUid;
+exports.createLogContext = createLogContext;
 const tslib_1 = require("tslib");
 const recheck_1 = require("recheck");
 const traverse_1 = tslib_1.__importDefault(require("traverse"));
+const uuid_1 = require("uuid");
+const short_uuid_1 = require("short-uuid");
 const auth_handler_1 = tslib_1.__importDefault(require("./auth-handler"));
 const _1 = require(".");
 const proxy_helper_1 = require("./proxy-helper");
@@ -251,7 +258,6 @@ function clearProgressModuleSetting() {
         _1.configHandler.set('log', logConfig);
     }
 }
-exports.clearProgressModuleSetting = clearProgressModuleSetting;
 /**
  * Get authentication method from config
  * @returns Authentication method string ('OAuth', 'Basic Auth', or empty string)
@@ -268,7 +274,6 @@ function getAuthenticationMethod() {
     // Return empty string if unknown
     return '';
 }
-exports.getAuthenticationMethod = getAuthenticationMethod;
 /**
  * Creates a standardized context object for logging
  * This context contains all session-level metadata that should be in session.json
@@ -279,6 +284,12 @@ exports.getAuthenticationMethod = getAuthenticationMethod;
  * @param authenticationMethod - Optional authentication method
  * @returns Context object with all session-level metadata
  */
+function generateUid() {
+    return (0, uuid_1.v4)();
+}
+function generateShortUid() {
+    return (0, short_uuid_1.generate)();
+}
 function createLogContext(commandId, apiKey, authenticationMethod) {
     // Store apiKey in configHandler so it's available for session.json
     if (apiKey) {
@@ -296,4 +307,3 @@ function createLogContext(commandId, apiKey, authenticationMethod) {
         authenticationMethod: authMethod,
     };
 }
-exports.createLogContext = createLogContext;

package/lib/http-client/client.d.ts

@@ -229,8 +229,8 @@ export declare class HttpClient implements IHttpClient {
      * Get the axios instance for interceptor access
      */
     get interceptors(): {
-        request: import("axios").AxiosInterceptorManager<import("axios").InternalAxiosRequestConfig<any>>;
-        response: import("axios").AxiosInterceptorManager<AxiosResponse<any, any, {}>>;
+        request: import("axios").AxiosInterceptorManager<import("axios").InternalAxiosRequestConfig>;
+        response: import("axios").AxiosInterceptorManager<AxiosResponse>;
     };
     /**
      * Returns the request payload depending on the selected request payload format.

package/lib/http-client/client.js

@@ -7,6 +7,22 @@ const http_response_1 = require("./http-response");
 const config_handler_1 = tslib_1.__importDefault(require("../config-handler"));
 const auth_handler_1 = tslib_1.__importDefault(require("../auth-handler"));
 const proxy_helper_1 = require("../proxy-helper");
+/**
+ * Derive request host from baseURL or url for NO_PROXY checks.
+ */
+function getRequestHost(baseURL, url) {
+    const toTry = [baseURL, url].filter(Boolean);
+    for (const u of toTry) {
+        try {
+            const parsed = new URL(u.startsWith('http') ? u : `https://${u}`);
+            return parsed.hostname || undefined;
+        }
+        catch (_a) {
+            // ignore
+        }
+    }
+    return undefined;
+}
 class HttpClient {
     /**
      * Createa new pending HTTP request instance.
@@ -340,12 +356,16 @@ class HttpClient {
                 this.headers({ 'x-header-ea': Object.values(earlyAccessHeaders).join(',') });
             }
         }
-        // Configure proxy if available (priority: request.proxy > getProxyConfig())
+        // Configure proxy if available. NO_PROXY has priority; fall back to region CMA for host resolution.
         if (!this.request.proxy) {
-            const proxyConfig = (0, proxy_helper_1.getProxyConfig)();
+            const host = getRequestHost(this.request.baseURL, url) || (0, proxy_helper_1.resolveRequestHost)({});
+            const proxyConfig = (0, proxy_helper_1.getProxyConfigForHost)(host);
             if (proxyConfig) {
                 this.request.proxy = proxyConfig;
             }
+            else if (host && (0, proxy_helper_1.shouldBypassProxy)(host)) {
+                this.request.proxy = false;
+            }
         }
         return await this.axiosInstance(Object.assign(Object.assign({ url,
             method, withCredentials: true }, this.request), { data: this.prepareRequestPayload() }));

package/lib/http-client/http-response.d.ts

@@ -1,5 +1,5 @@
 import { AxiosResponse, AxiosResponseHeaders, RawAxiosResponseHeaders } from 'axios';
-export declare class HttpResponse<ResponseType = any> {
+export declare class HttpResponse<_ResponseType = any> {
     /**
      * The Axios response object.
      */

package/lib/http-client/http-response.js

@@ -1,6 +1,7 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpResponse = void 0;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 class HttpResponse {
     /**
      * Wrap the given Axios `response` into a new response instance.

package/lib/index.d.ts

@@ -22,8 +22,10 @@ export * from './path-validator';
 export { default as CLITable, TableFlags, TableHeader, TableOptions, TableData } from './cli-table';
 export { App, AppData, Installation, marketplaceSDKClient, MarketplaceSDKInitiator, marketplaceSDKInitiator, ContentstackMarketplaceClient, ContentstackMarketplaceConfig, };
 export { Args, CommandHelp, Config, Errors, Flags, loadHelpClass, Help, HelpBase, HelpSection, HelpSectionRenderer, HelpSectionKeyValueTable, Hook, Interfaces, Parser, Plugin, run, toStandardizedId, toConfiguredId, settings, Settings, flush, ux, execute, } from '@oclif/core';
-export { FlagInput, ArgInput, FlagDefinition } from '@oclif/core/lib/interfaces/parser';
+export type { FlagInput, ArgInput, FlagDefinition } from '@oclif/core/lib/interfaces/parser';
 export { default as TablePrompt } from './inquirer-table-prompt';
+export { loadChalk, getChalk } from './chalk';
+export type { ChalkInstance } from './chalk';
 export { Logger };
 export { default as authenticationHandler } from './authentication-handler';
 export { v2Logger as log, cliErrorHandler, handleAndLogError, getLogPath, getSessionLogPath } from './logger/log';