From 2f317e2260ce93f56ac479d421b2bc5c9c882bf1 Mon Sep 17 00:00:00 2001
From: raj pandey <raj.pandey@contentstack.com>
Date: Tue, 3 Mar 2026 13:12:50 +0530
Subject: [PATCH 1/2] fix(utilities): single session log folder per run via
 cache in getSessionLogPath

---
 packages/contentstack-auth/package.json       |  6 ++--
 packages/contentstack-command/package.json    |  4 +--
 packages/contentstack-config/package.json     |  6 ++--
 packages/contentstack-utilities/package.json  |  2 +-
 .../src/logger/session-path.ts                | 20 +++++++++++-
 packages/contentstack/package.json            | 32 +++++++++----------
 6 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/packages/contentstack-auth/package.json b/packages/contentstack-auth/package.json
index 023b38a50d..17dd0dafc1 100644
--- a/packages/contentstack-auth/package.json
+++ b/packages/contentstack-auth/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-auth",
   "description": "Contentstack CLI plugin for authentication activities",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -22,8 +22,8 @@
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
   },
   "dependencies": {
-    "@contentstack/cli-command": "~2.0.0-beta",
-    "@contentstack/cli-utilities": "~2.0.0-beta.1",
+    "@contentstack/cli-command": "~2.0.0-beta.2",
+    "@contentstack/cli-utilities": "~2.0.0-beta.2",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.28",
     "otplib": "^12.0.1"
diff --git a/packages/contentstack-command/package.json b/packages/contentstack-command/package.json
index 72badc5331..d871dd94a9 100644
--- a/packages/contentstack-command/package.json
+++ b/packages/contentstack-command/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-command",
   "description": "Contentstack CLI plugin for configuration",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "author": "Contentstack",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -20,7 +20,7 @@
     "test:unit": "mocha --timeout 10000 --forbid-only \"test/unit/**/*.test.ts\""
   },
   "dependencies": {
-    "@contentstack/cli-utilities": "~2.0.0-beta.1",
+    "@contentstack/cli-utilities": "~2.0.0-beta.2",
     "contentstack": "^3.25.3",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.28"
diff --git a/packages/contentstack-config/package.json b/packages/contentstack-config/package.json
index 5282ea85db..e927407d67 100644
--- a/packages/contentstack-config/package.json
+++ b/packages/contentstack-config/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-config",
   "description": "Contentstack CLI plugin for configuration",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "author": "Contentstack",
   "scripts": {
     "build": "pnpm compile && oclif manifest",
@@ -21,8 +21,8 @@
     "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
   },
   "dependencies": {
-    "@contentstack/cli-command": "~2.0.0-beta",
-    "@contentstack/cli-utilities": "~2.0.0-beta.1",
+    "@contentstack/cli-command": "~2.0.0-beta.2",
+    "@contentstack/cli-utilities": "~2.0.0-beta.2",
     "@contentstack/utils": "~1.7.0",
     "@oclif/core": "^4.8.1",
     "@oclif/plugin-help": "^6.2.28",
diff --git a/packages/contentstack-utilities/package.json b/packages/contentstack-utilities/package.json
index ced7b18980..8ac5aca904 100644
--- a/packages/contentstack-utilities/package.json
+++ b/packages/contentstack-utilities/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
diff --git a/packages/contentstack-utilities/src/logger/session-path.ts b/packages/contentstack-utilities/src/logger/session-path.ts
index 89aaa7f68b..8c4ab6a44f 100644
--- a/packages/contentstack-utilities/src/logger/session-path.ts
+++ b/packages/contentstack-utilities/src/logger/session-path.ts
@@ -60,13 +60,22 @@ function createSessionMetadataFile(sessionPath: string, metadata: Record<string,
   }
 }
 
+// Cache session path for the process so multiple callers (e.g. Logger's 5 level
+// loggers, export/import command at end, completeProgressWithMessage per module)
+// get one folder instead of many.
+let cachedSessionPath: string | null = null;
+
 /**
  * Get the session-based log path for date-organized logging
  * Structure: {basePath}/{YYYY-MM-DD}/{command}-{YYYYMMDD-HHMMSS}-{sessionId}/
- * 
+ *
  * @returns The session-specific log directory path
  */
 export function getSessionLogPath(): string {
+  if (cachedSessionPath) {
+    return cachedSessionPath;
+  }
+
   // Get base log path
   const basePath = getLogPath();
 
@@ -115,6 +124,15 @@ export function getSessionLogPath(): string {
     createSessionMetadataFile(sessionPath, metadata);
   }
 
+  cachedSessionPath = sessionPath;
   return sessionPath;
 }
 
+/**
+ * Clear the cached session path. Used by tests so each test gets a fresh path.
+ * Not needed in normal CLI usage (one process = one command = one cache).
+ */
+export function clearSessionLogPathCache(): void {
+  cachedSessionPath = null;
+}
+
diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
index 26ebbf955d..99dae13252 100755
--- a/packages/contentstack/package.json
+++ b/packages/contentstack/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.14",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run.js"
@@ -22,23 +22,23 @@
     "prepack": "pnpm compile && oclif manifest && oclif readme"
   },
   "dependencies": {
-    "@contentstack/cli-audit": "~2.0.0-beta.5",
-    "@contentstack/cli-cm-export": "~2.0.0-beta.10",
-    "@contentstack/cli-cm-import": "~2.0.0-beta.10",
-    "@contentstack/cli-auth": "~2.0.0-beta.6",
+    "@contentstack/cli-audit": "~2.0.0-beta.6",
+    "@contentstack/cli-cm-export": "~2.0.0-beta.11",
+    "@contentstack/cli-cm-import": "~2.0.0-beta.11",
+    "@contentstack/cli-auth": "~2.0.0-beta.7",
     "@contentstack/cli-bulk-operations": "^1.0.0-beta",
-    "@contentstack/cli-cm-bootstrap": "~2.0.0-beta.10",
-    "@contentstack/cli-cm-branches": "~2.0.0-beta.1",
-    "@contentstack/cli-cm-clone": "~2.0.0-beta.11",
-    "@contentstack/cli-cm-export-to-csv": "~2.0.0-beta.1",
-    "@contentstack/cli-cm-import-setup": "~2.0.0-beta.5",
-    "@contentstack/cli-cm-seed": "~2.0.0-beta.9",
-    "@contentstack/cli-command": "~2.0.0-beta",
-    "@contentstack/cli-config": "~2.0.0-beta.2",
+    "@contentstack/cli-cm-bootstrap": "~2.0.0-beta.11",
+    "@contentstack/cli-cm-branches": "~2.0.0-beta.2",
+    "@contentstack/cli-cm-clone": "~2.0.0-beta.12",
+    "@contentstack/cli-cm-export-to-csv": "~2.0.0-beta.2",
+    "@contentstack/cli-cm-import-setup": "~2.0.0-beta.6",
+    "@contentstack/cli-cm-seed": "~2.0.0-beta.10",
+    "@contentstack/cli-command": "~2.0.0-beta.2",
+    "@contentstack/cli-config": "~2.0.0-beta.3",
     "@contentstack/cli-launch": "^1.9.6",
-    "@contentstack/cli-migration": "~2.0.0-beta.6",
-    "@contentstack/cli-utilities": "~2.0.0-beta.1",
-    "@contentstack/cli-variants": "~2.0.0-beta.7",
+    "@contentstack/cli-migration": "~2.0.0-beta.7",
+    "@contentstack/cli-utilities": "~2.0.0-beta.2",
+    "@contentstack/cli-variants": "~2.0.0-beta.8",
     "@contentstack/management": "~1.27.6",
     "@contentstack/utils": "~1.7.0",
     "@oclif/core": "^4.8.0",

From 31115599a87229dc788af48f9f2affba99cf414c Mon Sep 17 00:00:00 2001
From: raj pandey <raj.pandey@contentstack.com>
Date: Thu, 5 Mar 2026 12:46:44 +0530
Subject: [PATCH 2/2] Fix logger Test cases

---
 packages/contentstack-utilities/test/unit/logger.test.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/contentstack-utilities/test/unit/logger.test.ts b/packages/contentstack-utilities/test/unit/logger.test.ts
index 997c4fcf46..a840e46a3e 100644
--- a/packages/contentstack-utilities/test/unit/logger.test.ts
+++ b/packages/contentstack-utilities/test/unit/logger.test.ts
@@ -5,7 +5,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
 import Logger from '../../src/logger/logger';
-import { getSessionLogPath } from '../../src/logger/session-path';
+import { getSessionLogPath, clearSessionLogPathCache } from '../../src/logger/session-path';
 import configHandler from '../../src/config-handler';
 
 describe('Logger', () => {
@@ -239,6 +239,7 @@ describe('Session Log Path', () => {
 
   beforeEach(() => {
     sandbox = sinon.createSandbox();
+    clearSessionLogPathCache();
     // Create a temporary directory for testing
     tempDir = path.join(os.tmpdir(), `csdx-log-test-${Date.now()}`);
     fs.mkdirSync(tempDir, { recursive: true });