invert mrt flags

Author: clavery

.changeset/mrt-env-vars-non-prefixed.md

@@ -0,0 +1,7 @@
+---
+'@salesforce/b2c-tooling-sdk': patch
+'@salesforce/b2c-cli': patch
+'@salesforce/b2c-dx-mcp': patch
+---
+
+MRT environment variables now use non-prefixed names (`MRT_API_KEY`, `MRT_PROJECT`, `MRT_ENVIRONMENT`, `MRT_CLOUD_ORIGIN`) as primary. The `SFCC_`-prefixed versions continue to work as fallbacks.

actions/README.md

@@ -96,9 +96,9 @@ All actions accept auth inputs directly or read from `SFCC_*` environment variab
 | `password` | `SFCC_PASSWORD` | WebDAV operations |
 | `short-code` | `SFCC_SHORTCODE` | SCAPI operations |
 | `tenant-id` | `SFCC_TENANT_ID` | SCAPI operations |
-| `mrt-api-key` | `SFCC_MRT_API_KEY` | MRT operations |
-| `mrt-project` | `SFCC_MRT_PROJECT` | MRT operations |
-| `mrt-environment` | `SFCC_MRT_ENVIRONMENT` | MRT operations |
+| `mrt-api-key` | `MRT_API_KEY` | MRT operations |
+| `mrt-project` | `MRT_PROJECT` | MRT operations |
+| `mrt-environment` | `MRT_ENVIRONMENT` | MRT operations |
 | `account-manager-host` | `SFCC_ACCOUNT_MANAGER_HOST` | Account Manager |
 
 ## Plugins

actions/mrt-deploy/action.yml

@@ -6,10 +6,10 @@ branding:
 
 inputs:
   project:
-    description: 'MRT project slug (falls back to SFCC_MRT_PROJECT env var)'
+    description: 'MRT project slug (falls back to MRT_PROJECT env var)'
     required: false
   environment:
-    description: 'Target environment (falls back to SFCC_MRT_ENVIRONMENT env var)'
+    description: 'Target environment (falls back to MRT_ENVIRONMENT env var)'
     required: false
   build-directory:
     description: 'Local build directory'
@@ -23,7 +23,7 @@ inputs:
     required: false
   # Auth inputs for standalone use
   mrt-api-key:
-    description: 'MRT API key (falls back to SFCC_MRT_API_KEY env var)'
+    description: 'MRT API key (falls back to MRT_API_KEY env var)'
     required: false
   # Setup inputs
   version:

actions/setup/action.yml

@@ -38,13 +38,13 @@ inputs:
     description: 'Tenant ID → SFCC_TENANT_ID'
     required: false
   mrt-api-key:
-    description: 'MRT API key → SFCC_MRT_API_KEY'
+    description: 'MRT API key → MRT_API_KEY'
     required: false
   mrt-project:
-    description: 'MRT project slug → SFCC_MRT_PROJECT'
+    description: 'MRT project slug → MRT_PROJECT'
     required: false
   mrt-environment:
-    description: 'MRT environment → SFCC_MRT_ENVIRONMENT'
+    description: 'MRT environment → MRT_ENVIRONMENT'
     required: false
   account-manager-host:
     description: 'Account Manager hostname → SFCC_ACCOUNT_MANAGER_HOST'
@@ -116,13 +116,13 @@ runs:
           echo "SFCC_TENANT_ID=${{ inputs.tenant-id }}" >> "$GITHUB_ENV"
         fi
         if [ -n "${{ inputs.mrt-api-key }}" ]; then
-          echo "SFCC_MRT_API_KEY=${{ inputs.mrt-api-key }}" >> "$GITHUB_ENV"
+          echo "MRT_API_KEY=${{ inputs.mrt-api-key }}" >> "$GITHUB_ENV"
         fi
         if [ -n "${{ inputs.mrt-project }}" ]; then
-          echo "SFCC_MRT_PROJECT=${{ inputs.mrt-project }}" >> "$GITHUB_ENV"
+          echo "MRT_PROJECT=${{ inputs.mrt-project }}" >> "$GITHUB_ENV"
         fi
         if [ -n "${{ inputs.mrt-environment }}" ]; then
-          echo "SFCC_MRT_ENVIRONMENT=${{ inputs.mrt-environment }}" >> "$GITHUB_ENV"
+          echo "MRT_ENVIRONMENT=${{ inputs.mrt-environment }}" >> "$GITHUB_ENV"
         fi
         if [ -n "${{ inputs.account-manager-host }}" ]; then
           echo "SFCC_ACCOUNT_MANAGER_HOST=${{ inputs.account-manager-host }}" >> "$GITHUB_ENV"

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

@@ -15,8 +15,8 @@ jobs:
 
       - uses: SalesforceCommerceCloud/b2c-developer-tooling/actions/mrt-deploy@v1
         with:
-          mrt-api-key: ${{ secrets.SFCC_MRT_API_KEY }}
-          project: ${{ vars.SFCC_MRT_PROJECT }}
-          environment: ${{ vars.SFCC_MRT_ENVIRONMENT }}
+          mrt-api-key: ${{ secrets.MRT_API_KEY }}
+          project: ${{ vars.MRT_PROJECT }}
+          environment: ${{ vars.MRT_ENVIRONMENT }}
           build-directory: build
           message: 'Release ${{ github.event.release.tag_name }}'

docs/cli/mrt.md

@@ -28,9 +28,9 @@ These flags are available on all MRT commands:
 
 | Flag | Environment Variable | Description |
 |------|---------------------|-------------|
-| `--api-key` | `SFCC_MRT_API_KEY` | MRT API key |
-| `--project`, `-p` | `SFCC_MRT_PROJECT` | MRT project slug |
-| `--environment`, `-e` | `SFCC_MRT_ENVIRONMENT` | Target environment (e.g., staging, production) |
+| `--api-key` | `MRT_API_KEY` | MRT API key |
+| `--project`, `-p` | `MRT_PROJECT` | MRT project slug |
+| `--environment`, `-e` | `MRT_ENVIRONMENT` | Target environment (e.g., staging, production). `MRT_TARGET` also supported. |
 
 ### Configuration Sources
 
@@ -56,7 +56,7 @@ MRT commands use API key authentication. The API key is configured in the Manage
 Provide the API key via one of these methods:
 
 1. **Command-line flag**: `--api-key your-api-key`
-2. **Environment variable**: `export SFCC_MRT_API_KEY=your-api-key`
+2. **Environment variable**: `export MRT_API_KEY=your-api-key`
 3. **Mobify config file**: `~/.mobify` with `api_key` field
 
 ```json

docs/guide/authentication.md

@@ -357,7 +357,7 @@ MRT commands use a separate API key system.
 
 ```bash
 # Environment variable
-export SFCC_MRT_API_KEY=your-mrt-api-key
+export MRT_API_KEY=your-mrt-api-key
 
 # Or in ~/.mobify config file
 echo '{"api_key": "your-mrt-api-key"}' > ~/.mobify

docs/guide/ci-cd.md

@@ -29,15 +29,15 @@ Store credentials as GitHub [repository secrets](https://docs.github.com/en/acti
 | `SFCC_CLIENT_SECRET` | OAuth Client Secret |
 | `SFCC_USERNAME` | WebDAV username |
 | `SFCC_PASSWORD` | WebDAV password/access key |
-| `SFCC_MRT_API_KEY` | MRT API key |
+| `MRT_API_KEY` | MRT API key |
 
 **Recommended variables:**
 
 | Variable | Description |
 |----------|-------------|
 | `SFCC_SERVER` | B2C instance hostname |
-| `SFCC_MRT_PROJECT` | MRT project slug |
-| `SFCC_MRT_ENVIRONMENT` | MRT environment |
+| `MRT_PROJECT` | MRT project slug |
+| `MRT_ENVIRONMENT` | MRT environment |
 
 Credentials can be passed per-action or set once with the **setup** action so they're available to all subsequent steps.
 
@@ -213,9 +213,9 @@ Push and deploy an MRT bundle.
 ```yaml
 - uses: SalesforceCommerceCloud/b2c-developer-tooling/actions/mrt-deploy@v1
   with:
-    mrt-api-key: ${{ secrets.SFCC_MRT_API_KEY }}
-    project: ${{ vars.SFCC_MRT_PROJECT }}
-    environment: ${{ vars.SFCC_MRT_ENVIRONMENT }}
+    mrt-api-key: ${{ secrets.MRT_API_KEY }}
+    project: ${{ vars.MRT_PROJECT }}
+    environment: ${{ vars.MRT_ENVIRONMENT }}
     build-directory: build
     message: 'Deploy from CI'
 ```
@@ -330,9 +330,9 @@ jobs:
 
       - uses: SalesforceCommerceCloud/b2c-developer-tooling/actions/mrt-deploy@v1
         with:
-          mrt-api-key: ${{ secrets.SFCC_MRT_API_KEY }}
-          project: ${{ vars.SFCC_MRT_PROJECT }}
-          environment: ${{ vars.SFCC_MRT_ENVIRONMENT }}
+          mrt-api-key: ${{ secrets.MRT_API_KEY }}
+          project: ${{ vars.MRT_PROJECT }}
+          environment: ${{ vars.MRT_ENVIRONMENT }}
           build-directory: build
           message: 'Release ${{ github.event.release.tag_name }}'
 ```

docs/guide/configuration.md

@@ -78,10 +78,10 @@ You can configure the CLI using environment variables:
 | `SFCC_SANDBOX_API_HOST`       | ODS (sandbox) API hostname                                     |
 | `SFCC_CIP_HOST`               | CIP analytics host override                                    |
 | `SFCC_CIP_STAGING`            | Use staging CIP analytics host (`true`/`false`)                |
-| `SFCC_MRT_API_KEY`            | MRT API key                                                    |
-| `SFCC_MRT_PROJECT`            | MRT project slug                                               |
-| `SFCC_MRT_ENVIRONMENT`        | MRT environment name                                           |
-| `SFCC_MRT_CLOUD_ORIGIN`       | MRT API origin URL override                                    |
+| `MRT_API_KEY`                 | MRT API key (`SFCC_MRT_API_KEY` also supported)                |
+| `MRT_PROJECT`                 | MRT project slug (`SFCC_MRT_PROJECT` also supported)           |
+| `MRT_ENVIRONMENT`             | MRT environment name (`SFCC_MRT_ENVIRONMENT`, `MRT_TARGET` also supported) |
+| `MRT_CLOUD_ORIGIN`            | MRT API origin URL override (`SFCC_MRT_CLOUD_ORIGIN` also supported) |
 
 ## .env File
 
@@ -337,7 +337,7 @@ When you explicitly specify a hostname that differs from the `dw.json` hostname,
 Managed Runtime (MRT) commands use an API key for authentication. The API key is resolved in this order:
 
 1. `--api-key` flag
-2. `SFCC_MRT_API_KEY` environment variable
+2. `MRT_API_KEY` environment variable (also accepts `SFCC_MRT_API_KEY`)
 3. `~/.mobify` config file
 
 The `~/.mobify` file format:

docs/guide/storefront-next.md

@@ -66,7 +66,7 @@ Set up a Managed Runtime environment to host your storefront.
 - An MRT project (see [`b2c mrt project create`](/cli/mrt#b2c-mrt-project-create) to create one)
 
 ::: tip
-Configure your API key in `~/.mobify`, `dw.json`, or via the `SFCC_MRT_API_KEY` environment variable so you don't need to pass it on every command. See [Configuration](/guide/configuration) for all available options.
+Configure your API key in `~/.mobify`, `dw.json`, or via the `MRT_API_KEY` environment variable so you don't need to pass it on every command. See [Configuration](/guide/configuration) for all available options.
 :::
 
 Find your short code in Business Manager under **Administration > Salesforce Commerce API Settings**.