Merge branch 'v2-dev' into feat/migrate-external-cli-plugins-v2

Author: cs-raj

packages/contentstack-bootstrap/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-bootstrap",
   "description": "Bootstrap contentstack apps",
-  "version": "2.0.0-beta.19",
+  "version": "2.0.0-beta.18",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "scripts": {
@@ -19,7 +19,7 @@
     "@contentstack/cli-cm-seed": "~2.0.0-beta.18",
     "@contentstack/cli-command": "~2.0.0-beta.7",
     "@contentstack/cli-utilities": "~2.0.0-beta.8",
-    "@contentstack/cli-config": "~2.0.0-beta.9",
+    "@contentstack/cli-config": "~2.0.0-beta.10",
     "@oclif/core": "^4.3.0",
     "inquirer": "12.11.1",
     "mkdirp": "^2.1.6",
@@ -70,4 +70,4 @@
     }
   },
   "repository": "contentstack/cli"
-}
+}

packages/contentstack-export/package.json

@@ -7,7 +7,7 @@
   "dependencies": {
     "@contentstack/cli-command": "~2.0.0-beta.7",
     "@contentstack/cli-utilities": "~2.0.0-beta.8",
-    "@contentstack/cli-variants": "~2.0.0-beta.13",
+    "@contentstack/cli-variants": "~2.0.0-beta.14",
     "@contentstack/cli-asset-management": "~1.0.0-beta.2",
     "@oclif/core": "^4.8.0",
     "async": "^3.2.6",
@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "@contentstack/cli-auth": "~2.0.0-beta.12",
-    "@contentstack/cli-config": "~2.0.0-beta.9",
+    "@contentstack/cli-config": "~2.0.0-beta.10",
     "@contentstack/cli-dev-dependencies": "~2.0.0-beta.0",
     "@oclif/plugin-help": "^6.2.28",
     "@oclif/test": "^4.1.18",
@@ -99,4 +99,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}

packages/contentstack-import/package.json

@@ -8,7 +8,7 @@
     "@contentstack/cli-audit": "~2.0.0-beta.12",
     "@contentstack/cli-command": "~2.0.0-beta.7",
     "@contentstack/cli-utilities": "~2.0.0-beta.8",
-    "@contentstack/cli-variants": "~2.0.0-beta.13",
+    "@contentstack/cli-variants": "~2.0.0-beta.14",
     "@contentstack/cli-asset-management": "~1.0.0-beta.2",
     "@oclif/core": "^4.3.0",
     "big-json": "^3.2.0",

packages/contentstack-variants/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-variants",
-  "version": "2.0.0-beta.13",
+  "version": "2.0.0-beta.14",
   "description": "Variants plugin",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

packages/contentstack-variants/src/export/experiences.ts

@@ -16,7 +16,10 @@ export default class ExportExperiences extends PersonalizationAdapter<ExportConf
       headers: { 'X-Project-Uid': exportConfig.project_id },
       cmaConfig: {
         baseURL: exportConfig.region.cma + `/v3`,
-        headers: { api_key: exportConfig.apiKey },
+        headers: {
+          api_key: exportConfig.apiKey,
+          ...(exportConfig.branchName ? { branch: exportConfig.branchName } : {}),
+        },
       },
     });
     this.exportConfig = exportConfig;

packages/contentstack-variants/src/import/experiences.ts

@@ -50,7 +50,10 @@ export default class Experiences extends PersonalizationAdapter<ImportConfig> {
       headers: { 'X-Project-Uid': config.modules.personalize.project_id },
       cmaConfig: {
         baseURL: config.region.cma + `/v3`,
-        headers: { api_key: config.apiKey },
+        headers: {
+          api_key: config.apiKey,
+          ...(config.branchName ? { branch: config.branchName } : {}),
+        },
       },
     };
     super(Object.assign(config, conf));

packages/contentstack-variants/src/utils/personalization-api-adapter.ts

@@ -155,6 +155,17 @@ export class PersonalizationAdapter<T> extends AdapterHelper<T, HttpClient> impl
           this.cmaAPIClient?.headers({ authtoken: token });
         }
       }
+
+      // Ensure the CMA client targets the configured branch. Variant groups, CT
+      // links and other stack-CMA endpoints are branch-scoped, so without this
+      // header the requests would fall back to the default (main) branch even
+      // when the import/export is running against a non-main branch.
+      const branchName = (this.config as any)?.branchName;
+      if (this.adapterConfig.cmaConfig && branchName) {
+        log.debug(`Setting branch header for CMA client: ${branchName}`, this.exportConfig?.context);
+        this.cmaAPIClient?.headers({ branch: branchName });
+      }
+
       log.debug('Personalization adapter initialization completed', this.exportConfig?.context);
     } catch (error: any) {
       log.debug(`Personalization adapter initialization failed: ${error}`, this.exportConfig?.context);