normalize cloud origin config loading from dw.json source

Author: clavery

packages/b2c-tooling-sdk/src/cli/mrt-command.ts

@@ -31,7 +31,8 @@ import {DEFAULT_MRT_ORIGIN} from '../clients/mrt.js';
  * Cloud origin resolution:
  * 1. --cloud-origin flag
  * 2. SFCC_MRT_CLOUD_ORIGIN environment variable
- * 3. Default: https://cloud.mobify.com
+ * 3. dw.json (mrtOrigin field)
+ * 4. Default: https://cloud.mobify.com
  */
 export abstract class MrtCommand<T extends typeof Command> extends BaseCommand<T> {
   static baseFlags = {
@@ -52,7 +53,7 @@ export abstract class MrtCommand<T extends typeof Command> extends BaseCommand<T
       env: 'SFCC_MRT_ENVIRONMENT',
     }),
     'cloud-origin': Flags.string({
-      description: `MRT cloud origin URL (default: ${DEFAULT_MRT_ORIGIN})`,
+      description: `MRT cloud origin URL (or set mrtOrigin in dw.json; default: ${DEFAULT_MRT_ORIGIN})`,
       env: 'SFCC_MRT_CLOUD_ORIGIN',
     }),
     'credentials-file': Flags.string({

packages/b2c-tooling-sdk/src/config/dw-json.ts

@@ -59,6 +59,10 @@ export interface DwJsonConfig {
   mrtProject?: string;
   /** MRT environment name (e.g., staging, production) */
   mrtEnvironment?: string;
+  /** MRT cloud origin URL */
+  mrtOrigin?: string;
+  /** MRT cloud origin URL (alias) */
+  cloudOrigin?: string;
 }
 
 /**

packages/b2c-tooling-sdk/src/config/mapping.ts

@@ -54,6 +54,7 @@ export function mapDwJsonToNormalizedConfig(json: DwJsonConfig): NormalizedConfi
     accountManagerHost: json['account-manager-host'],
     mrtProject: json.mrtProject,
     mrtEnvironment: json.mrtEnvironment,
+    mrtOrigin: json.mrtOrigin || json.cloudOrigin,
   };
 }
 

packages/b2c-tooling-sdk/src/config/resolver.ts

@@ -208,6 +208,9 @@ export class ConfigResolver {
           if (!enrichedOptions.accountManagerHost && baseConfig.accountManagerHost) {
             enrichedOptions.accountManagerHost = baseConfig.accountManagerHost;
           }
+          if (!enrichedOptions.cloudOrigin && baseConfig.mrtOrigin) {
+            enrichedOptions.cloudOrigin = baseConfig.mrtOrigin;
+          }
         }
       }
     }