workflow and resolver bugfix

Author: clavery

actions/README.md

@@ -47,7 +47,7 @@ GitHub Actions for automating Salesforce B2C Commerce operations with the [`@sal
     client-secret: ${{ secrets.SFCC_CLIENT_SECRET }}
     server: ${{ vars.SFCC_SERVER }}
     code-version: ${{ vars.SFCC_CODE_VERSION }}
-    reload: true
+    activate: true
     cartridges: 'app_storefront_base,app_custom'
 ```
 

actions/code-deploy/action.yml

@@ -9,10 +9,14 @@ inputs:
     description: 'Path to cartridge source directory'
     required: false
     default: '.'
+  activate:
+    description: 'Activate the code version after deploy'
+    required: false
+    default: 'false'
   reload:
-    description: 'Activate/reload the code version after deploy'
+    description: 'Alias for activate (deprecated)'
     required: false
-    default: 'true'
+    default: 'false'
   code-version:
     description: 'Code version to deploy to (overrides SFCC_CODE_VERSION env var)'
     required: false
@@ -81,7 +85,7 @@ runs:
       run: |
         CMD="code deploy ${{ inputs.cartridge-path }}"
 
-        if [ "${{ inputs.reload }}" = "true" ]; then
+        if [ "${{ inputs.activate }}" = "true" ] || [ "${{ inputs.reload }}" = "true" ]; then
           CMD="$CMD --reload"
         fi
 

actions/workflow-templates/b2c-code-deploy.yml

@@ -18,4 +18,4 @@ jobs:
           username: ${{ secrets.SFCC_USERNAME }}
           password: ${{ secrets.SFCC_PASSWORD }}
           code-version: ${{ vars.SFCC_CODE_VERSION }}
-          reload: true
+          activate: true

docs/guide/ci-cd.md

@@ -8,7 +8,7 @@ The official actions handle CLI installation, credential configuration, and Node
 
 The actions are available from the `SalesforceCommerceCloud/b2c-developer-tooling` repository and support:
 
-- **Code deployment** — deploy cartridges with reload
+- **Code deployment** — deploy and activate cartridges
 - **Data import** — import site archives in a single step
 - **MRT deployment** — push and deploy MRT storefront bundles
 - **Job execution** — run B2C jobs with wait and timeout
@@ -80,7 +80,7 @@ jobs:
       - uses: SalesforceCommerceCloud/b2c-developer-tooling/actions/code-deploy@v1
         with:
           code-version: ${{ steps.version.outputs.code-version }}
-          reload: true
+          activate: true
 ```
 
 The **setup** step installs the CLI and configures credentials for all subsequent steps. Everything after that — your build, version calculation, and deploy — can focus on your project's needs.
@@ -169,7 +169,7 @@ Deploy cartridges with typed inputs.
 | Input | Default | Description |
 |-------|---------|-------------|
 | `cartridge-path` | `.` | Path to cartridge source directory |
-| `reload` | `true` | Activate code version after deploy |
+| `activate` | `false` | Activate code version after deploy |
 | `code-version` | — | Code version (overrides env) |
 | `cartridges` | — | Comma-separated cartridges to include |
 | `exclude-cartridges` | — | Comma-separated cartridges to exclude |

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

@@ -177,6 +177,15 @@ export class ConfigResolver {
     // CLI-provided options always take precedence over accumulated values.
     const enrichedOptions: ResolveConfigOptions = {...options};
 
+    // Seed enriched options from overrides (CLI flags) so that all sources—including
+    // the first one—can see CLI-provided values like accountManagerHost.
+    if (!enrichedOptions.accountManagerHost && overrides.accountManagerHost) {
+      enrichedOptions.accountManagerHost = overrides.accountManagerHost;
+    }
+    if (!enrichedOptions.cloudOrigin && overrides.mrtOrigin) {
+      enrichedOptions.cloudOrigin = normalizeOriginUrl(overrides.mrtOrigin);
+    }
+
     // Load from each source in order, merging results
     // Earlier sources have higher priority - later sources only fill in missing values
     for (const source of this.sources) {
@@ -283,7 +292,7 @@ export class ConfigResolver {
           );
 
           // Enrich options with accumulated config values for subsequent sources.
-          // Only set if not already provided via CLI options.
+          // Only set if not already provided via CLI options or overrides.
           if (!enrichedOptions.accountManagerHost && baseConfig.accountManagerHost) {
             enrichedOptions.accountManagerHost = baseConfig.accountManagerHost;
           }