fix(ci): support squash-merge bodies in auto-versioning and changelog

- Extend minor_pattern to match "* feat:" bullet lines from squash merges
- Replace GitHub's auto-generated release notes with a custom changelog
  step that parses feat/fix lines including squash-merge bullet bodies
- Update weekly promotion PR instructions to enforce merge commit strategy
- Move PR_NUMBER to env var to avoid script-injection risk
- Document merge commit requirement in CLAUDE.md

Author: actions-user

.github/workflows/auto-versioning.yml

@@ -41,8 +41,8 @@ jobs:
           # Use a pattern that will never match to prevent automated major bumps
           major_pattern: "/__MANUAL_MAJOR_BUMP_ONLY__/"
           # Regex pattern for minor version bump (new features)
-          # Matches: "feat:" prefix in commit messages (Conventional Commits)
-          minor_pattern: "/^feat(\\(.+\\))?:/"
+          # Matches "feat:" at line start, including "* feat:" bullet lines in squash-merge commit bodies
+          minor_pattern: "/^(\\* )?feat(\\(.+\\))?:/"
           # Patch bumps: All other commits (fix:, chore:, etc.) are treated as patches by default
           # Pattern to determine formatting
           version_format: "${major}.${minor}.${patch}"
@@ -87,13 +87,69 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Generate Release Changelog
+        id: changelog
+        if: ${{ steps.semver.outputs.changed == 'true' && steps.check_release.outputs.exists == 'false' }}
+        run: |
+          PREV_TAG=$(git describe --tags --abbrev=0 HEAD~1 2>/dev/null || echo "")
+          NEW_TAG="${{ steps.determine_tag.outputs.tag }}"
+          REPO="${{ github.repository }}"
+
+          rm -f /tmp/feat.txt /tmp/fix.txt
+          touch /tmp/feat.txt /tmp/fix.txt
+
+          # Extract feat/fix lines from commit messages, including squash-merge bullet bodies ("* feat: ...")
+          process_lines() {
+            while IFS= read -r line; do
+              clean="${line#\* }"
+              if echo "$clean" | grep -qE '^feat(\([^)]+\))?!?:'; then
+                echo "$clean" | sed -E 's/^feat(\([^)]+\))?!?: //' >> /tmp/feat.txt
+              elif echo "$clean" | grep -qE '^(fix|perf)(\([^)]+\))?!?:'; then
+                echo "$clean" | sed -E 's/^(fix|perf)(\([^)]+\))?!?: //' >> /tmp/fix.txt
+              fi
+            done
+          }
+
+          if [ -n "$PREV_TAG" ]; then
+            process_lines < <(git log --format="%B" "${PREV_TAG}..HEAD")
+          else
+            process_lines < <(git log --format="%B" -50 HEAD)
+          fi
+
+          {
+            echo "## What's Changed"
+            echo ""
+            if [ -s /tmp/feat.txt ]; then
+              echo "### 🚀 Features"
+              sed 's/^/- /' /tmp/feat.txt
+              echo ""
+            fi
+            if [ -s /tmp/fix.txt ]; then
+              echo "### 🐛 Bug Fixes & Improvements"
+              sed 's/^/- /' /tmp/fix.txt
+              echo ""
+            fi
+            if [ ! -s /tmp/feat.txt ] && [ ! -s /tmp/fix.txt ]; then
+              echo "_Dependency updates and maintenance._"
+              echo ""
+            fi
+            echo "---"
+            echo ""
+            if [ -n "$PREV_TAG" ]; then
+              echo "**Full Changelog**: https://github.com/${REPO}/compare/${PREV_TAG}...${NEW_TAG}"
+            fi
+          } > /tmp/release_body.md
+
+          echo "Generated changelog:"
+          cat /tmp/release_body.md
+
       - name: Create GitHub Release (creates tag via API)
         if: ${{ steps.semver.outputs.changed == 'true' && steps.check_release.outputs.exists == 'false' }}
         uses: softprops/action-gh-release@718ea10b132b3b2eba29c1007bb80653f286566b # v3
         with:
           tag_name: ${{ steps.determine_tag.outputs.tag }}
           name: Release ${{ steps.determine_tag.outputs.tag }}
-          generate_release_notes: true
+          body_path: /tmp/release_body.md
           make_latest: true
           draft: false
           prerelease: false

.github/workflows/weekly-nightly-promotion.yml

@@ -333,13 +333,19 @@ jobs:
             - [ ] Changelog is up-to-date (auto-generated via workflow)
             - [ ] Version bump is appropriate (if applicable)
 
-            ## Merge Instructions
+            ## ⚠️ Merge Instructions — CRITICAL
 
-            This PR promotes changes from \`nightly\` to \`main\`. Once all checks pass:
+            > **You MUST use "Create a merge commit" — NOT squash or rebase.**
+            >
+            > Squash merging collapses all \`feat:\`/\`fix:\` commits into a single bullet-list body.
+            > The auto-versioning workflow cannot parse these bullets, so minor version bumps are
+            > silently skipped and release notes only show the weekly PR title instead of real changes.
+
+            Once all checks pass:
 
             1. **Review** the commit summary above
             2. **Approve** if changes look correct
-            3. **Merge** using "Merge commit" to preserve history
+            3. **Merge** → click the dropdown arrow → select **"Create a merge commit"**
 
             ---
 
@@ -430,6 +436,8 @@ jobs:
     steps:
       - name: Dispatch missing required workflows on nightly head
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        env:
+          PR_NUMBER: ${{ needs.create-promotion-pr.outputs.pr_number }}
         with:
           script: |
             const owner = context.repo.owner;
@@ -443,7 +451,7 @@ jobs:
             const nightlyHeadSha = nightlyBranch.commit.sha;
             core.info(`Current nightly HEAD for dispatch fallback: ${nightlyHeadSha}`);
 
-            const prNumber = '${{ needs.create-promotion-pr.outputs.pr_number }}';
+            const prNumber = process.env.PR_NUMBER;
             const requiredWorkflows = [
               { id: 'e2e-tests-split.yml' },
               { id: 'codeql.yml' },

CLAUDE.md

@@ -100,6 +100,7 @@ Before proposing ANY code change or fix, build a mental map of the feature:
 
 - **Triggers**: Use `feat:`, `fix:`, or `perf:` to trigger Docker builds. `chore:` skips builds.
 - **Beta**: `feature/beta-release` always builds.
+- **Weekly Promotion PRs** (`nightly → main`): ALWAYS merge using **"Create a merge commit"** — NEVER squash or rebase. Squash merging collapses all commits into bullet lines that the `auto-versioning` workflow cannot parse, silently preventing minor version bumps and producing empty release notes.
 - **History-Rewrite PRs**: If a PR touches files in `scripts/history-rewrite/` or `docs/plans/history_rewrite.md`, the PR description MUST include the history-rewrite checklist from `.github/PULL_REQUEST_TEMPLATE/history-rewrite.md`.
 
 ## PR Sizing & Decomposition