Merge branch 'v2-dev-bugfix' into fix/dx-4439-v2-dev-interactive-mode-messages

Author: harshithad0703

package.json

@@ -19,7 +19,8 @@
     "clean:lock": "rm -f pnpm-lock.yaml",
     "clean:all": "pnpm store prune && rm -rf node_modules && pnpm run clean:packages",
     "setup": "pnpm run clean:all && pnpm run bootstrap && pnpm run build",
-    "prepare": "npx husky && chmod +x .husky/pre-commit"
+    "prepare": "npx husky && chmod +x .husky/pre-commit",
+    "update:lockfile": "pnpm install --lockfile-only"
   },
   "license": "MIT",
   "packageManager": "pnpm@10.28.0",

packages/contentstack-auth/package.json

@@ -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"

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"

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",

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",

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;
+}
+

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 });

packages/contentstack/package.json

@@ -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-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",