@contentstack/cli-utilities 1.19.0-beta.0 → 1.19.1

package/lib/contentstack-management-sdk.js

@@ -19,12 +19,12 @@ class ManagementSDKInitiator {
         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 bypassing, clear proxy env immediately so SDK never see it (they may read at init or first request).
-        if (!proxyConfig) {
+        // 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,
@@ -112,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/feature-status/build-auth-headers.d.ts

@@ -0,0 +1,9 @@
+export interface AuthHeaders {
+    [key: string]: string;
+}
+export declare function buildAuthHeaders(ctx?: {
+    managementToken?: string;
+    apiKey?: string;
+    authToken?: string;
+    orgUid?: string;
+}): AuthHeaders;

package/lib/feature-status/build-auth-headers.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildAuthHeaders = void 0;
+const tslib_1 = require("tslib");
+const config_handler_1 = tslib_1.__importDefault(require("../config-handler"));
+function buildAuthHeaders(ctx) {
+    var _a, _b;
+    // 1. Management token takes priority (no 'Bearer' prefix — API contract)
+    if ((ctx === null || ctx === void 0 ? void 0 : ctx.managementToken) && (ctx === null || ctx === void 0 ? void 0 : ctx.apiKey)) {
+        return {
+            Authorization: ctx.managementToken,
+            api_key: ctx.apiKey,
+        };
+    }
+    // 2. OAuth
+    const oauthToken = config_handler_1.default.get('oauthAccessToken');
+    if (oauthToken) {
+        return { Authorization: `Bearer ${oauthToken}` };
+    }
+    // 3. Authtoken + organization_uid
+    const authtoken = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.authToken) !== null && _a !== void 0 ? _a : config_handler_1.default.get('authtoken');
+    const orgUid = (_b = ctx === null || ctx === void 0 ? void 0 : ctx.orgUid) !== null && _b !== void 0 ? _b : config_handler_1.default.get('oauthOrgUid');
+    if (authtoken && orgUid) {
+        return { authtoken, organization_uid: orgUid };
+    }
+    // 4. Authtoken + api_key
+    if (authtoken && (ctx === null || ctx === void 0 ? void 0 : ctx.apiKey)) {
+        return { authtoken, api_key: ctx.apiKey };
+    }
+    throw new Error('PLAN_CHECK: Cannot build auth headers — no valid credentials available. ' +
+        'Please log in or provide a management token alias.');
+}
+exports.buildAuthHeaders = buildAuthHeaders;

package/lib/feature-status/feature-status-handler.d.ts

@@ -0,0 +1,3 @@
+import { FeatureStatus, FeatureCtx } from './types';
+export declare function isFeatureEnabled(featureUid: string, ctx?: FeatureCtx): Promise<FeatureStatus>;
+export declare function assertFeatureEnabled(featureUid: string, ctx?: FeatureCtx): Promise<FeatureStatus>;

package/lib/feature-status/feature-status-handler.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertFeatureEnabled = exports.isFeatureEnabled = void 0;
+const http_client_1 = require("../http-client");
+const resolve_auth_host_1 = require("./resolve-auth-host");
+const build_auth_headers_1 = require("./build-auth-headers");
+async function isFeatureEnabled(featureUid, ctx) {
+    const host = (0, resolve_auth_host_1.resolveAuthHost)(ctx);
+    const headers = (0, build_auth_headers_1.buildAuthHeaders)(ctx);
+    const client = new http_client_1.HttpClient();
+    client.baseUrl(host).headers(headers);
+    const res = await client.get(`/v1/feature-status?feature_uid=${encodeURIComponent(featureUid)}`);
+    if (res.status < 200 || res.status >= 300) {
+        throw new Error(`PLAN_CHECK: feature-status API returned ${res.status} for "${featureUid}".`);
+    }
+    return res.data;
+}
+exports.isFeatureEnabled = isFeatureEnabled;
+async function assertFeatureEnabled(featureUid, ctx) {
+    let status;
+    try {
+        status = await isFeatureEnabled(featureUid, ctx);
+    }
+    catch (e) {
+        throw new Error(`Could not verify your plan for "${featureUid}". ` +
+            `This command requires a confirmed plan status to run. ` +
+            `Please retry; if the problem persists contact support. (${e.message})`);
+    }
+    if (!status.is_part_of_plan) {
+        throw new Error(`"${featureUid}" is not part of your current plan. Please upgrade your plan to use this feature.`);
+    }
+    if (status.status !== 'enabled') {
+        throw new Error(`"${featureUid}" is not enabled for your plan (status: ${status.status}).`);
+    }
+    return status;
+}
+exports.assertFeatureEnabled = assertFeatureEnabled;

package/lib/feature-status/feature-uids.d.ts

@@ -0,0 +1,5 @@
+export declare const FEATURE: {
+    readonly ASSET_MANAGEMENT: "amAssets";
+    readonly ASSET_SCANNING: "assetsScan";
+};
+export type FeatureUid = (typeof FEATURE)[keyof typeof FEATURE];

package/lib/feature-status/feature-uids.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FEATURE = void 0;
+exports.FEATURE = {
+    ASSET_MANAGEMENT: 'amAssets',
+    ASSET_SCANNING: 'assetsScan',
+};

package/lib/feature-status/index.d.ts

@@ -0,0 +1,5 @@
+export * from './types';
+export * from './feature-uids';
+export { resolveAuthHost } from './resolve-auth-host';
+export { buildAuthHeaders } from './build-auth-headers';
+export { isFeatureEnabled, assertFeatureEnabled } from './feature-status-handler';

package/lib/feature-status/index.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertFeatureEnabled = exports.isFeatureEnabled = exports.buildAuthHeaders = exports.resolveAuthHost = void 0;
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./types"), exports);
+tslib_1.__exportStar(require("./feature-uids"), exports);
+var resolve_auth_host_1 = require("./resolve-auth-host");
+Object.defineProperty(exports, "resolveAuthHost", { enumerable: true, get: function () { return resolve_auth_host_1.resolveAuthHost; } });
+var build_auth_headers_1 = require("./build-auth-headers");
+Object.defineProperty(exports, "buildAuthHeaders", { enumerable: true, get: function () { return build_auth_headers_1.buildAuthHeaders; } });
+var feature_status_handler_1 = require("./feature-status-handler");
+Object.defineProperty(exports, "isFeatureEnabled", { enumerable: true, get: function () { return feature_status_handler_1.isFeatureEnabled; } });
+Object.defineProperty(exports, "assertFeatureEnabled", { enumerable: true, get: function () { return feature_status_handler_1.assertFeatureEnabled; } });

package/lib/feature-status/resolve-auth-host.d.ts

@@ -0,0 +1,8 @@
+export declare function resolveAuthHost(ctx?: {
+    region?: {
+        endpoints?: {
+            auth?: string;
+        };
+        cma?: string;
+    };
+}): string;

package/lib/feature-status/resolve-auth-host.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveAuthHost = void 0;
+const tslib_1 = require("tslib");
+const config_handler_1 = tslib_1.__importDefault(require("../config-handler"));
+// Mirrors config:set:region's own custom-region fallback (region.ts's transformUrl) —
+// same heuristic, applied retroactively for a custom region that predates auth-api.
+// Computed fresh on each call, never persisted back to config.
+function deriveAuthFromCma(cma) {
+    let transformed = cma.replace('api', 'auth-api');
+    if (transformed.startsWith('http')) {
+        transformed = transformed.split('//')[1];
+    }
+    transformed = transformed.replace(/^dev\d+/, 'dev');
+    transformed = transformed.endsWith('io') ? transformed.replace('io', 'com') : transformed;
+    return `https://${transformed}`;
+}
+function resolveAuthHost(ctx) {
+    var _a, _b;
+    const region = ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.region) !== null && _a !== void 0 ? _a : config_handler_1.default.get('region'));
+    let authUrl = (_b = region === null || region === void 0 ? void 0 : region.endpoints) === null || _b === void 0 ? void 0 : _b.auth;
+    if (!authUrl && (region === null || region === void 0 ? void 0 : region.cma)) {
+        authUrl = deriveAuthFromCma(region.cma);
+    }
+    if (!authUrl) {
+        throw new Error('PLAN_CHECK: Auth host is not configured for the current region. ' +
+            "Re-run `csdx config:set:region` to refresh region endpoints.");
+    }
+    return String(authUrl).replace(/\/$/, '');
+}
+exports.resolveAuthHost = resolveAuthHost;

package/lib/feature-status/types.d.ts

@@ -0,0 +1,21 @@
+export interface FeatureStatus {
+    org_uid: string;
+    feature_key: string;
+    status: 'enabled' | 'disabled' | string;
+    limit: number;
+    max_limit: number;
+    is_part_of_plan: boolean;
+}
+export interface FeatureCtx {
+    apiKey?: string;
+    orgUid?: string;
+    managementToken?: string;
+    authToken?: string;
+    region?: {
+        name?: string;
+        cma?: string;
+        endpoints?: {
+            auth?: string;
+        };
+    };
+}

package/lib/feature-status/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/fs-utility/core.js

@@ -337,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;
         }
@@ -367,7 +365,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 {

package/lib/helpers.d.ts

@@ -42,6 +42,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,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLogContext = exports.getAuthenticationMethod = 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.createLogContext = exports.generateShortUid = exports.generateUid = exports.getAuthenticationMethod = 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;
 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");
@@ -271,6 +273,14 @@ exports.getAuthenticationMethod = getAuthenticationMethod;
  * @param authenticationMethod - Optional authentication method
  * @returns Context object with all session-level metadata
  */
+function generateUid() {
+    return (0, uuid_1.v4)();
+}
+exports.generateUid = generateUid;
+function generateShortUid() {
+    return (0, short_uuid_1.generate)();
+}
+exports.generateShortUid = generateShortUid;
 function createLogContext(commandId, apiKey, authenticationMethod) {
     // Store apiKey in configHandler so it's available for session.json
     if (apiKey) {

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<any, any>>;
+        response: import("axios").AxiosInterceptorManager<AxiosResponse<any, any, {}, any>>;
     };
     /**
      * Returns the request payload depending on the selected request payload format.

package/lib/http-client/client.js

@@ -12,13 +12,13 @@ const proxy_helper_1 = require("../proxy-helper");
  */
 function getRequestHost(baseURL, url) {
     const toTry = [baseURL, url].filter(Boolean);
-    for (const candidateUrl of toTry) {
+    for (const u of toTry) {
         try {
-            const parsed = new URL(candidateUrl.startsWith('http') ? candidateUrl : `https://${candidateUrl}`);
+            const parsed = new URL(u.startsWith('http') ? u : `https://${u}`);
             return parsed.hostname || undefined;
         }
         catch (_a) {
-            // Invalid URL; try next candidate (baseURL or url)
+            // ignore
         }
     }
     return undefined;
@@ -356,13 +356,16 @@ class HttpClient {
                 this.headers({ 'x-header-ea': Object.values(earlyAccessHeaders).join(',') });
             }
         }
-        // Configure proxy if available. NO_PROXY has priority: hosts in NO_PROXY never use proxy.
+        // Configure proxy if available. NO_PROXY has priority; fall back to region CMA for host resolution.
         if (!this.request.proxy) {
-            const host = getRequestHost(this.request.baseURL, url);
-            const proxyConfig = host ? (0, proxy_helper_1.getProxyConfigForHost)(host) : (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,11 @@ 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 { Logger };
 export { default as authenticationHandler } from './authentication-handler';
 export { v2Logger as log, cliErrorHandler, handleAndLogError, getLogPath } from './logger/log';
+export * from './feature-status';
+export * from './region-endpoints';
+export { refreshRegionEndpoints } from './region-refresh';

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLogPath = exports.handleAndLogError = exports.cliErrorHandler = exports.log = exports.authenticationHandler = exports.Logger = exports.TablePrompt = exports.execute = exports.ux = exports.flush = exports.settings = exports.toConfiguredId = exports.toStandardizedId = exports.run = exports.Plugin = exports.Parser = exports.Interfaces = exports.HelpBase = exports.Help = exports.loadHelpClass = exports.Flags = exports.Errors = exports.Config = exports.CommandHelp = exports.Args = exports.marketplaceSDKInitiator = exports.MarketplaceSDKInitiator = exports.marketplaceSDKClient = exports.CLITable = exports.createLogContext = exports.Command = exports.flags = exports.args = exports.NodeCrypto = exports.printFlagDeprecation = exports.managementSDKInitiator = exports.managementSDKClient = exports.configHandler = exports.authHandler = exports.messageHandler = exports.CLIError = exports.cliux = exports.LoggerService = void 0;
+exports.refreshRegionEndpoints = exports.getLogPath = exports.handleAndLogError = exports.cliErrorHandler = exports.log = exports.authenticationHandler = exports.Logger = exports.TablePrompt = exports.execute = exports.ux = exports.flush = exports.settings = exports.toConfiguredId = exports.toStandardizedId = exports.run = exports.Plugin = exports.Parser = exports.Interfaces = exports.HelpBase = exports.Help = exports.loadHelpClass = exports.Flags = exports.Errors = exports.Config = exports.CommandHelp = exports.Args = exports.marketplaceSDKInitiator = exports.MarketplaceSDKInitiator = exports.marketplaceSDKClient = exports.CLITable = exports.createLogContext = exports.Command = exports.flags = exports.args = exports.NodeCrypto = exports.printFlagDeprecation = exports.managementSDKInitiator = exports.managementSDKClient = exports.configHandler = exports.authHandler = exports.messageHandler = exports.CLIError = exports.cliux = exports.LoggerService = void 0;
 const tslib_1 = require("tslib");
 const logger_1 = tslib_1.__importDefault(require("./logger"));
 exports.Logger = logger_1.default;
@@ -72,3 +72,7 @@ Object.defineProperty(exports, "log", { enumerable: true, get: function () { ret
 Object.defineProperty(exports, "cliErrorHandler", { enumerable: true, get: function () { return log_1.cliErrorHandler; } });
 Object.defineProperty(exports, "handleAndLogError", { enumerable: true, get: function () { return log_1.handleAndLogError; } });
 Object.defineProperty(exports, "getLogPath", { enumerable: true, get: function () { return log_1.getLogPath; } });
+tslib_1.__exportStar(require("./feature-status"), exports);
+tslib_1.__exportStar(require("./region-endpoints"), exports);
+var region_refresh_1 = require("./region-refresh");
+Object.defineProperty(exports, "refreshRegionEndpoints", { enumerable: true, get: function () { return region_refresh_1.refreshRegionEndpoints; } });

package/lib/interfaces/index.d.ts

@@ -16,7 +16,7 @@ export interface InquirePayload {
     default?: any;
     message: string;
     choices?: Array<any>;
-    transformer?: Function;
+    transformer?: (value: any) => any;
     validate?(input: any, answers?: any): boolean | string | Promise<boolean | string>;
     selectAll?: boolean;
     pageSize?: number;

package/lib/logger/cli-error-handler.js

@@ -175,7 +175,7 @@ class CLIErrorHandler {
      */
     extractErrorPayload(error) {
         var _a, _b, _c, _d;
-        const { name, message, code, status, response, request, config, statusText } = error;
+        const { name, code, status, response, request, config, statusText } = error;
         const payload = {
             name,
             message: this.extractClearMessage(error),

package/lib/logger/log.js

@@ -96,7 +96,7 @@ function getLogPath() {
         fs.accessSync(cwdPath, fs.constants.W_OK);
         return cwdPath;
     }
-    catch (error) {
+    catch (_a) {
         // If current directory is not writable, fall back to home directory
     }
     // 4. Fallback to home directory

package/lib/logger/logger.d.ts

@@ -12,6 +12,12 @@ export default class Logger {
     private isSensitiveKey;
     private redactObject;
     private redact;
+    /**
+     * Stringifies a log entry without throwing on circular references.
+     * `redact()` can fall back to the original (still-circular) object when
+     * cloning fails, so this must never assume the input is cycle-free.
+     */
+    private safeStringify;
     private shouldLog;
     error(message: string, meta?: any): void;
     warn(message: string, meta?: any): void;

package/lib/logger/logger.js

@@ -53,7 +53,7 @@ class Logger {
                 new winston.transports.File(Object.assign(Object.assign({}, this.loggerOptions), { filename: `${filePath}/${level}.log`, format: winston.format.combine(winston.format.timestamp(), winston.format.printf((info) => {
                         // Apply minimal redaction for files (debugging info preserved)
                         const redactedInfo = this.redact(info, false);
-                        return JSON.stringify(redactedInfo);
+                        return this.safeStringify(redactedInfo);
                     })) })),
                 new winston.transports.Console({
                     format: winston.format.combine(winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }), winston.format.printf((info) => {
@@ -97,6 +97,28 @@ class Logger {
             return info;
         }
     }
+    /**
+     * Stringifies a log entry without throwing on circular references.
+     * `redact()` can fall back to the original (still-circular) object when
+     * cloning fails, so this must never assume the input is cycle-free.
+     */
+    safeStringify(value) {
+        var _a;
+        const seen = new WeakSet();
+        try {
+            return JSON.stringify(value, (_key, val) => {
+                if (typeof val === 'object' && val !== null) {
+                    if (seen.has(val))
+                        return '[Circular]';
+                    seen.add(val);
+                }
+                return val;
+            });
+        }
+        catch (_b) {
+            return JSON.stringify({ level: value === null || value === void 0 ? void 0 : value.level, message: (_a = value === null || value === void 0 ? void 0 : value.message) !== null && _a !== void 0 ? _a : '[Unserializable log entry]' });
+        }
+    }
     shouldLog(level, target) {
         // If console logging is disabled, don't log to console
         if (target === 'console' && this.config.consoleLoggingEnabled === false) {
@@ -143,9 +165,12 @@ class Logger {
         if (this.shouldLog('error', 'file')) {
             this.loggers.error.error(logPayload);
         }
-        // For console, use debug level if hidden, otherwise error level
+        // For console, use debug level if hidden, otherwise error level. Each level's
+        // winston logger instance bundles both the file and console transports, so only
+        // write again here when the target differs from the one already written above —
+        // otherwise this would duplicate both the console line and the file entry.
         const consoleLevel = params.hidden ? 'debug' : 'error';
-        if (this.shouldLog(consoleLevel, 'console')) {
+        if (consoleLevel !== 'error' && this.shouldLog(consoleLevel, 'console')) {
             this.loggers[consoleLevel].error(logPayload);
         }
     }

package/lib/logger/session-path.js

@@ -43,7 +43,7 @@ function createSessionMetadataFile(sessionPath, metadata) {
     try {
         fs.writeFileSync(metadataPath, JSON.stringify(metadata, null, 2), 'utf8');
     }
-    catch (error) {
+    catch (_a) {
         // Silently fail if metadata file cannot be created
         // Logging here would cause circular dependency
         // The session folder and logs will still be created

package/lib/proxy-helper.d.ts

@@ -23,8 +23,9 @@ export declare function getNoProxyList(): string[];
  */
 export declare function shouldBypassProxy(host: string): boolean;
 /**
- * Get proxy configuration. Sources (in order): env (HTTP_PROXY/HTTPS_PROXY), then global config
- * from `csdx config:set:proxy --host <host> --port <port> --protocol <protocol>`.
+ * Get proxy configuration. Priority order (per spec):
+ * 1. Global CLI config from `csdx config:set:proxy --host <host> --port <port> --protocol <protocol>`
+ * 2. Environment variables (HTTPS_PROXY or HTTP_PROXY)
  * For per-request use, prefer getProxyConfigForHost(host) so NO_PROXY overrides both sources.
  * @returns ProxyConfig object or undefined if no proxy is configured
  */
@@ -39,10 +40,9 @@ export declare function getProxyConfig(): ProxyConfig | undefined;
  */
 export declare function getProxyConfigForHost(host: string): ProxyConfig | undefined;
 /**
- * Resolve request host for proxy/NO_PROXY checks: config.host or default CMA from region.
- * Use when the caller may omit host so NO_PROXY still applies (e.g. from region.cma).
- * @param config - Object with optional host (e.g. API client config)
- * @returns Host string (hostname or empty)
+ * Hostname for NO_PROXY / proxy. Prefer `region.cma` when set so callers that pass a
+ * default SDK host (e.g. bulk-entries -> api.contentstack.io) still match rules like
+ * `.csnonprod.com` against the real API host (e.g. dev11-api.csnonprod.com).
  */
 export declare function resolveRequestHost(config: {
     host?: string;

package/lib/proxy-helper.js

@@ -82,40 +82,14 @@ function shouldBypassProxy(host) {
 }
 exports.shouldBypassProxy = shouldBypassProxy;
 /**
- * Get proxy configuration. Sources (in order): env (HTTP_PROXY/HTTPS_PROXY), then global config
- * from `csdx config:set:proxy --host <host> --port <port> --protocol <protocol>`.
+ * Get proxy configuration. Priority order (per spec):
+ * 1. Global CLI config from `csdx config:set:proxy --host <host> --port <port> --protocol <protocol>`
+ * 2. Environment variables (HTTPS_PROXY or HTTP_PROXY)
  * For per-request use, prefer getProxyConfigForHost(host) so NO_PROXY overrides both sources.
  * @returns ProxyConfig object or undefined if no proxy is configured
  */
 function getProxyConfig() {
-    // Priority 1: Environment variables (HTTPS_PROXY or HTTP_PROXY)
-    const proxyUrl = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
-    if (proxyUrl) {
-        try {
-            const url = new URL(proxyUrl);
-            const defaultPort = url.protocol === 'https:' ? 443 : 80;
-            const port = url.port ? Number.parseInt(url.port, 10) : defaultPort;
-            if (!Number.isNaN(port) && port >= 1 && port <= 65535) {
-                const protocol = url.protocol.replace(':', '');
-                const proxyConfig = {
-                    protocol: protocol,
-                    host: url.hostname,
-                    port: port,
-                };
-                if (url.username || url.password) {
-                    proxyConfig.auth = {
-                        username: url.username,
-                        password: url.password,
-                    };
-                }
-                return proxyConfig;
-            }
-        }
-        catch (_a) {
-            // Invalid URL, continue to check global config
-        }
-    }
-    // Priority 2: Global config (csdx config:set:proxy)
+    // Priority 1: Global config (csdx config:set:proxy)
     const globalProxyConfig = config_handler_1.default.get('proxy');
     if (globalProxyConfig) {
         if (typeof globalProxyConfig === 'object') {
@@ -145,11 +119,38 @@ function getProxyConfig() {
                     return proxyConfig;
                 }
             }
-            catch (_b) {
-                // Invalid URL, return undefined
+            catch (_a) {
+                // Invalid URL, continue to check environment
             }
         }
     }
+    // Priority 2: Environment variables (HTTPS_PROXY or HTTP_PROXY)
+    const proxyUrl = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
+    if (proxyUrl) {
+        try {
+            const url = new URL(proxyUrl);
+            const defaultPort = url.protocol === 'https:' ? 443 : 80;
+            const port = url.port ? Number.parseInt(url.port, 10) : defaultPort;
+            if (!Number.isNaN(port) && port >= 1 && port <= 65535) {
+                const protocol = url.protocol.replace(':', '');
+                const proxyConfig = {
+                    protocol: protocol,
+                    host: url.hostname,
+                    port: port,
+                };
+                if (url.username || url.password) {
+                    proxyConfig.auth = {
+                        username: url.username,
+                        password: url.password,
+                    };
+                }
+                return proxyConfig;
+            }
+        }
+        catch (_b) {
+            // Invalid URL, return undefined
+        }
+    }
     return undefined;
 }
 exports.getProxyConfig = getProxyConfig;
@@ -167,30 +168,39 @@ function getProxyConfigForHost(host) {
     return getProxyConfig();
 }
 exports.getProxyConfigForHost = getProxyConfigForHost;
+function regionCmaHostname() {
+    var _a;
+    const cma = (_a = config_handler_1.default.get('region')) === null || _a === void 0 ? void 0 : _a.cma;
+    if (!cma || typeof cma !== 'string') {
+        return '';
+    }
+    if (cma.startsWith('http')) {
+        try {
+            const u = new URL(cma);
+            return u.hostname || cma;
+        }
+        catch (_b) {
+            return cma;
+        }
+    }
+    return cma;
+}
 /**
- * Resolve request host for proxy/NO_PROXY checks: config.host or default CMA from region.
- * Use when the caller may omit host so NO_PROXY still applies (e.g. from region.cma).
- * @param config - Object with optional host (e.g. API client config)
- * @returns Host string (hostname or empty)
+ * Hostname for NO_PROXY / proxy. Prefer `region.cma` when set so callers that pass a
+ * default SDK host (e.g. bulk-entries -> api.contentstack.io) still match rules like
+ * `.csnonprod.com` against the real API host (e.g. dev11-api.csnonprod.com).
  */
 function resolveRequestHost(config) {
     var _a;
-    if (config.host)
-        return config.host;
-    const cma = (_a = config_handler_1.default.get('region')) === null || _a === void 0 ? void 0 : _a.cma;
-    if (cma && typeof cma === 'string') {
-        if (cma.startsWith('http')) {
-            try {
-                const u = new URL(cma);
-                return u.hostname || cma;
-            }
-            catch (_b) {
-                return cma;
-            }
-        }
-        return cma;
+    const fromRegion = regionCmaHostname();
+    if (fromRegion) {
+        return normalizeHost(fromRegion) || fromRegion;
+    }
+    const raw = ((_a = config.host) === null || _a === void 0 ? void 0 : _a.trim()) || '';
+    if (!raw) {
+        return '';
     }
-    return '';
+    return normalizeHost(raw) || raw;
 }
 exports.resolveRequestHost = resolveRequestHost;
 /**

package/lib/region-endpoints.d.ts

@@ -0,0 +1,25 @@
+export interface RegionEndpoints {
+    [key: string]: string;
+}
+export interface CanonicalRegion {
+    name: string;
+    cma: string;
+    cda: string;
+    uiHost: string;
+    developerHubUrl: string;
+    launchHubUrl: string;
+    personalizeUrl: string;
+    composableStudioUrl: string;
+    endpoints: RegionEndpoints;
+}
+/**
+ * Resolve the canonical endpoint set for a region name/alias via @contentstack/utils.
+ * Returns null when the name isn't a recognized region (e.g. a custom region name).
+ */
+export declare function resolveCanonicalEndpoints(name: string): RegionEndpoints | null;
+/**
+ * Build a region object from a raw endpoints map, keeping the existing named
+ * fields (cma/cda/uiHost/...) plus a full raw `endpoints` passthrough so any
+ * future endpoint Contentstack adds is available without further code changes.
+ */
+export declare function buildRegionFromEndpoints(name: string, endpoints: RegionEndpoints): CanonicalRegion;

package/lib/region-endpoints.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildRegionFromEndpoints = exports.resolveCanonicalEndpoints = void 0;
+const utils_1 = require("@contentstack/utils");
+/**
+ * Resolve the canonical endpoint set for a region name/alias via @contentstack/utils.
+ * Returns null when the name isn't a recognized region (e.g. a custom region name).
+ */
+function resolveCanonicalEndpoints(name) {
+    try {
+        const endpoints = (0, utils_1.getContentstackEndpoint)(name);
+        if (!endpoints || typeof endpoints === 'string')
+            return null;
+        return endpoints;
+    }
+    catch (_a) {
+        return null;
+    }
+}
+exports.resolveCanonicalEndpoints = resolveCanonicalEndpoints;
+/**
+ * Build a region object from a raw endpoints map, keeping the existing named
+ * fields (cma/cda/uiHost/...) plus a full raw `endpoints` passthrough so any
+ * future endpoint Contentstack adds is available without further code changes.
+ */
+function buildRegionFromEndpoints(name, endpoints) {
+    return {
+        name,
+        cma: endpoints.contentManagement,
+        cda: endpoints.contentDelivery,
+        uiHost: endpoints.application,
+        developerHubUrl: endpoints.developerHub,
+        launchHubUrl: endpoints.launch,
+        personalizeUrl: endpoints.personalizeManagement,
+        composableStudioUrl: endpoints.composableStudio,
+        endpoints,
+    };
+}
+exports.buildRegionFromEndpoints = buildRegionFromEndpoints;

package/lib/region-refresh.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Self-heals the persisted region config on every CLI invocation so that
+ * customers who set their region on an older CLI version (before a field
+ * like authUrl existed) get it backfilled without re-running
+ * `csdx config:set:region`. Only named/built-in regions are touched — a
+ * custom region's name won't resolve via resolveCanonicalEndpoints, so it's
+ * left untouched. Never throws.
+ */
+export declare function refreshRegionEndpoints(): void;

package/lib/region-refresh.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.refreshRegionEndpoints = void 0;
+const tslib_1 = require("tslib");
+const config_handler_1 = tslib_1.__importDefault(require("./config-handler"));
+const region_endpoints_1 = require("./region-endpoints");
+/**
+ * Self-heals the persisted region config on every CLI invocation so that
+ * customers who set their region on an older CLI version (before a field
+ * like authUrl existed) get it backfilled without re-running
+ * `csdx config:set:region`. Only named/built-in regions are touched — a
+ * custom region's name won't resolve via resolveCanonicalEndpoints, so it's
+ * left untouched. Never throws.
+ */
+function refreshRegionEndpoints() {
+    const stored = config_handler_1.default.get('region');
+    if (!(stored === null || stored === void 0 ? void 0 : stored.name))
+        return;
+    const endpoints = (0, region_endpoints_1.resolveCanonicalEndpoints)(stored.name);
+    if (!endpoints)
+        return;
+    const merged = Object.assign(Object.assign({}, stored), (0, region_endpoints_1.buildRegionFromEndpoints)(stored.name, endpoints));
+    if (JSON.stringify(merged) !== JSON.stringify(stored)) {
+        config_handler_1.default.set('region', merged);
+    }
+}
+exports.refreshRegionEndpoints = refreshRegionEndpoints;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.19.0-beta.0",
+  "version": "1.19.1",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -9,14 +9,8 @@
     "build": "pnpm compile",
     "clean": "rm -rf ./lib ./node_modules tsconfig.tsbuildinfo",
     "compile": "tsc -b tsconfig.json",
-    "test:report": "tsc -p test && nyc --reporter=lcov --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
-    "pretest": "tsc -p test",
-    "test": "nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
-    "posttest": "npm run lint",
-    "lint": "eslint src/**/*.ts",
-    "format": "eslint src/**/*.ts --fix",
-    "test:unit": "mocha --forbid-only \"test/unit/**/*.test.ts\"",
-    "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
+    "test": "mocha \"test/unit/**/*.test.ts\"",
+    "lint": "eslint src/**/*.ts"
   },
   "repository": {
     "type": "git",
@@ -33,10 +27,11 @@
   "author": "contentstack",
   "license": "MIT",
   "dependencies": {
-    "@contentstack/management": "~1.27.5",
-    "@contentstack/marketplace-sdk": "^1.5.0",
-    "@oclif/core": "^4.3.0",
-    "axios": "^1.13.5",
+    "@contentstack/management": "~1.30.1",
+    "@contentstack/marketplace-sdk": "^1.5.1",
+    "@contentstack/utils": "~1.9.1",
+    "@oclif/core": "^4.11.4",
+    "axios": "^1.16.1",
     "chalk": "^4.1.2",
     "cli-cursor": "^3.1.0",
     "cli-progress": "^3.12.0",
@@ -47,9 +42,9 @@
     "inquirer": "8.2.7",
     "inquirer-search-checkbox": "^1.0.0",
     "inquirer-search-list": "^1.2.6",
-    "js-yaml": "^4.1.1",
+    "js-yaml": "^4.2.0",
     "klona": "^2.0.6",
-    "lodash": "^4.17.23",
+    "lodash": "^4.18.1",
     "mkdirp": "^1.0.4",
     "open": "^8.4.2",
     "ora": "^5.4.1",
@@ -59,26 +54,32 @@
     "traverse": "^0.6.11",
     "tty-table": "^4.2.3",
     "unique-string": "^2.0.0",
-    "uuid": "^9.0.1",
-    "winston": "^3.17.0",
+    "short-uuid": "^6.0.0",
+    "uuid": "^14.0.0",
+    "winston": "^3.19.0",
     "xdg-basedir": "^4.0.0"
   },
+  "overrides": {
+    "@oclif/core": {
+      "picomatch": "^4.0.4"
+    }
+  },
   "devDependencies": {
     "@types/chai": "^4.3.20",
-    "@types/inquirer": "^9.0.8",
+    "@types/inquirer": "^9.0.9",
     "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^10.0.10",
     "@types/node": "^14.18.63",
     "@types/sinon": "^21.0.0",
     "@types/traverse": "^0.6.37",
     "chai": "^4.5.0",
-    "eslint": "^8.57.1",
+    "eslint": "^10.5.0",
     "eslint-config-oclif": "^6.0.62",
     "eslint-config-oclif-typescript": "^3.1.14",
     "fancy-test": "^2.0.42",
     "mocha": "10.8.2",
     "nyc": "^15.1.0",
-    "sinon": "^21.0.1",
+    "sinon": "^21.1.2",
     "ts-node": "^10.9.2",
     "typescript": "^4.9.5"
   }