Merge remote-tracking branch 'origin/main' into feature/vsc-ext-native-improvements

# Conflicts:
#	.github/workflows/publish.yml

Author: clavery

.changeset/add-cip-topic-and-reports.md

@@ -5,9 +5,11 @@ on:
     branches:
       - main
       - 'renovate/**'
+      - 'release/**'
   pull_request:
     branches:
       - main
+      - 'release/**'
 
 permissions:
   contents: read
@@ -58,6 +60,9 @@ jobs:
       - name: Build packages
         run: pnpm -r run build
 
+      - name: Build documentation
+        run: pnpm run docs:build
+
       - name: Run SDK tests
         id: sdk-test
         working-directory: packages/b2c-tooling-sdk

.changeset/decouple-json-from-logs.md

@@ -12,7 +12,7 @@ permissions:
 
 concurrency:
   group: pages
-  cancel-in-progress: false
+  cancel-in-progress: true
 
 jobs:
   build:
@@ -54,20 +54,39 @@ jobs:
       - name: Get latest release tag
         id: release
         run: |
-          LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+          # Find the most recent package tag and docs tag by creation date.
+          # This is safe because only @latest publishes and doc-only releases
+          # trigger this workflow — maintenance patches on older minors are
+          # excluded by the publish workflow gate.
+          PKG_TAG=$(git tag --list '@salesforce/*' --sort=-creatordate | head -n1)
+          DOCS_TAG=$(git tag --list 'docs@*' --sort=-creatordate | head -n1)
+
+          # Pick whichever tag was created more recently
+          LATEST_TAG=""
+          if [[ -n "$PKG_TAG" && -n "$DOCS_TAG" ]]; then
+            LATEST_TAG=$(git tag --list '@salesforce/*' --list 'docs@*' --sort=-creatordate | head -n1)
+          elif [[ -n "$PKG_TAG" ]]; then
+            LATEST_TAG="$PKG_TAG"
+          elif [[ -n "$DOCS_TAG" ]]; then
+            LATEST_TAG="$DOCS_TAG"
+          fi
+
+          echo "Latest package tag: ${PKG_TAG:-<none>}"
+          echo "Latest docs tag: ${DOCS_TAG:-<none>}"
+          echo "Building stable docs from: ${LATEST_TAG:-<none>}"
+
           echo "tag=$LATEST_TAG" >> $GITHUB_OUTPUT
           echo "exists=$([[ -n $LATEST_TAG ]] && echo true || echo false)" >> $GITHUB_OUTPUT
 
-      - name: Build main documentation
-        run: pnpm run docs:build
-        env:
-          RELEASE_VERSION: ${{ steps.release.outputs.tag }}
+      - name: Build dev documentation
+        run: |
+          IS_DEV_BUILD=true pnpm run docs:build
+          mv docs/.vitepress/dist docs/.vitepress/dist-dev
 
-      - name: Build release documentation
+      - name: Build stable documentation from release tag
         if: steps.release.outputs.exists == 'true'
         run: |
-          # Save main build and config (config has version dropdown code)
-          mv docs/.vitepress/dist docs/.vitepress/dist-main
+          # Save config from main (has version dropdown and dynamic base path)
           cp docs/.vitepress/config.mts /tmp/config.mts
 
           # Remove S3-extracted uxstudio files before checkout to avoid conflicts
@@ -87,14 +106,17 @@ jobs:
           # Restore config from main (has version dropdown and dynamic base path)
           cp /tmp/config.mts docs/.vitepress/config.mts
 
-          # Build at release tag with main's config
+          # Build at release tag with main's config (no IS_DEV_BUILD = stable at root)
           pnpm install --frozen-lockfile
           pnpm -r run build
-          RELEASE_VERSION=${{ steps.release.outputs.tag }} IS_RELEASE_BUILD=true pnpm run docs:build
+          pnpm run docs:build
+
+          # Combine: stable at root, dev in /dev/
+          mv docs/.vitepress/dist-dev docs/.vitepress/dist/dev
 
-          # Combine: main at root, release in /release/
-          mv docs/.vitepress/dist docs/.vitepress/dist-main/release
-          mv docs/.vitepress/dist-main docs/.vitepress/dist
+      - name: Use dev as root when no release exists
+        if: steps.release.outputs.exists != 'true'
+        run: mv docs/.vitepress/dist-dev docs/.vitepress/dist
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3