Merge remote-tracking branch 'upstream/main' into W-21112167-Replications-API

Author: charithaT07

.changeset/docs-mcp-preview-update.md

@@ -0,0 +1,5 @@
+---
+'@salesforce/b2c-cli': patch
+---
+
+Fix GitHub Actions for external repository usage by replacing relative `./actions/setup` and `./actions/run` references with fully qualified `SalesforceCommerceCloud/b2c-developer-tooling/actions/setup@v1` and `SalesforceCommerceCloud/b2c-developer-tooling/actions/run@v1` in all composite actions.

.changeset/fix-actions-external-refs.md

@@ -172,19 +172,22 @@ SCAPI APIs use an `organizationId` path parameter with the `f_ecom_` prefix, but
 
 ```typescript
 // From @salesforce/b2c-tooling-sdk (or clients/custom-apis.ts)
-import {toOrganizationId, toTenantId, buildTenantScope} from '@salesforce/b2c-tooling-sdk';
+import {toOrganizationId, normalizeTenantId, buildTenantScope} from '@salesforce/b2c-tooling-sdk';
 
-// Convert tenant ID to organization ID (adds f_ecom_ prefix)
+// Convert tenant ID to organization ID (normalizes + adds f_ecom_ prefix)
 toOrganizationId('zzxy_prd')        // Returns 'f_ecom_zzxy_prd'
 toOrganizationId('f_ecom_zzxy_prd') // Returns 'f_ecom_zzxy_prd' (unchanged)
+toOrganizationId('zzxy-prd')        // Returns 'f_ecom_zzxy_prd' (hyphen normalized)
 
-// Extract raw tenant ID (strips f_ecom_ prefix)
-toTenantId('f_ecom_zzxy_prd')       // Returns 'zzxy_prd'
-toTenantId('zzxy_prd')              // Returns 'zzxy_prd' (unchanged)
+// Normalize any tenant/org ID form to canonical underscore format
+normalizeTenantId('f_ecom_zzxy_prd')                              // Returns 'zzxy_prd'
+normalizeTenantId('zzxy-prd')                                     // Returns 'zzxy_prd'
+normalizeTenantId('zzxy-prd.dx.commercecloud.salesforce.com')     // Returns 'zzxy_prd'
 
-// Build tenant-specific OAuth scope
+// Build tenant-specific OAuth scope (normalizes input)
 buildTenantScope('zzxy_prd')        // Returns 'SALESFORCE_COMMERCE_API:zzxy_prd'
 buildTenantScope('f_ecom_zzxy_prd') // Returns 'SALESFORCE_COMMERCE_API:zzxy_prd'
+buildTenantScope('zzxy-prd')        // Returns 'SALESFORCE_COMMERCE_API:zzxy_prd'
 ```
 
 ### Constants
@@ -272,20 +275,19 @@ export function createCustomApisClient(
 export const ORGANIZATION_ID_PREFIX = 'f_ecom_';
 export const SCAPI_TENANT_SCOPE_PREFIX = 'SALESFORCE_COMMERCE_API:';
 
-export function toOrganizationId(tenantId: string): string {
-  return tenantId.startsWith(ORGANIZATION_ID_PREFIX)
-    ? tenantId
-    : `${ORGANIZATION_ID_PREFIX}${tenantId}`;
+export function normalizeTenantId(value: string): string {
+  let id = value.trim();
+  if (id.includes('.')) id = id.split('.')[0];
+  if (id.startsWith(ORGANIZATION_ID_PREFIX)) id = id.slice(ORGANIZATION_ID_PREFIX.length);
+  return id.replaceAll('-', '_');
 }
 
-export function toTenantId(value: string): string {
-  return value.startsWith(ORGANIZATION_ID_PREFIX)
-    ? value.slice(ORGANIZATION_ID_PREFIX.length)
-    : value;
+export function toOrganizationId(tenantId: string): string {
+  return `${ORGANIZATION_ID_PREFIX}${normalizeTenantId(tenantId)}`;
 }
 
 export function buildTenantScope(tenantId: string): string {
-  return `${SCAPI_TENANT_SCOPE_PREFIX}${toTenantId(tenantId)}`;
+  return `${SCAPI_TENANT_SCOPE_PREFIX}${normalizeTenantId(tenantId)}`;
 }
 ```
 
@@ -440,13 +442,13 @@ const {data, error} = await client.GET('/endpoint', {...});
 
 ## Troubleshooting
 
-**OAuth scope errors (401/403 from SCAPI)**: Ensure the client factory calls `auth.withAdditionalScopes()` with both the domain scope (e.g., `sfcc.custom-apis`) and the tenant-specific scope (`SALESFORCE_COMMERCE_API:<tenantId>`). Use `buildTenantScope()` to strip the `f_ecom_` prefix from tenant IDs before building scopes.
+**OAuth scope errors (401/403 from SCAPI)**: Ensure the client factory calls `auth.withAdditionalScopes()` with both the domain scope (e.g., `sfcc.custom-apis`) and the tenant-specific scope (`SALESFORCE_COMMERCE_API:<tenantId>`). Use `buildTenantScope()` which normalizes any tenant ID form (hyphenated, hostname, org ID) to canonical underscores before building scopes.
 
 **Type generation failures**: Check that the OpenAPI spec in `specs/` is valid YAML/JSON. Run `pnpm --filter @salesforce/b2c-tooling-sdk run generate:types` and inspect the output. Common issues: spec references external files that aren't present, or uses OpenAPI features not supported by openapi-typescript.
 
 **Middleware ordering issues**: Auth middleware should be added first (`client.use(createAuthMiddleware(...))`), then logging. In openapi-fetch, middleware runs in reverse registration order for requests, so auth registered first means it runs last — ensuring the logging middleware sees the final request with auth headers.
 
-**`organizationId` mismatch**: SCAPI path parameters need the `f_ecom_` prefix (use `toOrganizationId()`), while OAuth scopes need the raw tenant ID (use `toTenantId()`). Mixing these up causes 404s or scope errors.
+**`organizationId` mismatch**: SCAPI path parameters need the `f_ecom_` prefix (use `toOrganizationId()`), while OAuth scopes need the raw tenant ID (use `normalizeTenantId()`). Both functions accept any parseable form (hyphenated, hostname, org ID). Mixing these up causes 404s or scope errors.
 
 ## Checklist: New SCAPI Client
 

.changeset/mcp-tool-reference-docs.md

@@ -259,6 +259,13 @@ jobs:
             echo "No tags to create"
           fi
 
+      - name: Update v1 Actions tag
+        if: steps.release-type.outputs.type == 'stable' && steps.changesets.outputs.skip != 'true' && steps.quick-check.outputs.skip != 'true'
+        run: |
+          git tag -f v1
+          git push origin v1 --force
+          echo "Updated v1 tag to $(git rev-parse HEAD)"
+
       - name: Create docs tag if version changed
         if: steps.release-type.outputs.type == 'stable' && steps.changesets.outputs.skip != 'true' && steps.quick-check.outputs.skip != 'true' && steps.packages.outputs.publish_docs == 'true'
         run: |

.changeset/unregister-placeholder-tools.md

@@ -194,32 +194,3 @@ jobs:
         with:
           command: 'webdav put --help'
           json: 'false'
-
-  # E2E tests — only on main, requires e2e-dev environment with real credentials
-  e2e:
-    name: 'E2E'
-    if: github.ref == 'refs/heads/main'
-    runs-on: ubuntu-latest
-    environment: e2e-dev
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup with real credentials
-        uses: ./actions/setup
-        with:
-          client-id: ${{ secrets.SFCC_CLIENT_ID }}
-          client-secret: ${{ secrets.SFCC_CLIENT_SECRET }}
-          server: ${{ vars.SFCC_SERVER }}
-          username: ${{ secrets.SFCC_USERNAME }}
-          password: ${{ secrets.SFCC_PASSWORD }}
-
-      - name: List code versions
-        id: code-list
-        uses: ./actions/run
-        with:
-          command: 'code list'
-
-      - name: Verify code list output
-        run: |
-          echo "Result: ${{ steps.code-list.outputs.result }}"
-          [ "${{ steps.code-list.outputs.exit-code }}" = "0" ] || exit 1

.claude/skills/api-client-development/SKILL.md

@@ -49,13 +49,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'
@@ -77,7 +77,7 @@ runs:
   steps:
     - name: Setup B2C CLI
       id: setup
-      uses: ./actions/setup
+      uses: SalesforceCommerceCloud/b2c-developer-tooling/actions/setup@v1
       with:
         version: ${{ inputs.version }}
         node-version: ${{ inputs.node-version }}
@@ -97,7 +97,7 @@ runs:
     - name: Run command
       id: command
       if: inputs.command != ''
-      uses: ./actions/run
+      uses: SalesforceCommerceCloud/b2c-developer-tooling/actions/run@v1
       with:
         command: ${{ inputs.command }}
         json: ${{ inputs.json }}

.github/workflows/publish.yml

@@ -63,7 +63,7 @@ GitHub Actions for automating Salesforce B2C Commerce operations with the [`@sal
     username: ${{ secrets.SFCC_USERNAME }}
     password: ${{ secrets.SFCC_PASSWORD }}
     target: './export/site-import.zip'
-    timeout: 300
+    timeout: 600
 ```
 
 ### Raw CLI command
@@ -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
@@ -156,3 +156,5 @@ When `json: true` (default), the `result` output contains the parsed JSON from t
   with:
     version: '0.4.1'  # Pin CLI version
 ```
+
+> **Note:** High-level actions (`code-deploy`, `data-import`, `job-run`, `mrt-deploy`, `webdav-upload`) and the root action internally reference `actions/setup@v1` and `actions/run@v1`. This means even if you pin the outer action to a specific SHA or tag, the setup and run steps resolve to the latest `v1` release. For full SHA-level reproducibility, use `actions/setup` + `actions/run` directly — each can be pinned independently to an exact SHA. For most users, `@v1` on the high-level actions is the recommended approach.

.github/workflows/test-actions.yml

@@ -64,7 +64,7 @@ runs:
   using: 'composite'
   steps:
     - name: Ensure CLI is installed
-      uses: ./actions/setup
+      uses: SalesforceCommerceCloud/b2c-developer-tooling/actions/setup@v1
       with:
         version: ${{ inputs.version }}
         node-version: ${{ inputs.node-version }}
@@ -113,7 +113,7 @@ runs:
 
     - name: Deploy cartridges
       id: deploy
-      uses: ./actions/run
+      uses: SalesforceCommerceCloud/b2c-developer-tooling/actions/run@v1
       with:
         command: ${{ steps.build-cmd.outputs.cmd }}
         json: 'true'