From ba6ecf436e67d8b455fd895ad903af25673bc98c Mon Sep 17 00:00:00 2001
From: Bas van den Aakster <bvdaakster@gmail.com>
Date: Sat, 13 Sep 2025 12:50:00 +0200
Subject: [PATCH 1/8] feat: add automated version management with AI-generated
 changelogs

- Created version/major, version/minor, and version/patch branches for semantic versioning
- Added GitHub Actions workflow for automated version bumping and publishing
- Integrated Claude Code CLI for AI-generated changelogs in commit messages and releases
- Added comprehensive documentation for version workflow usage
- Workflow includes testing, building, NPM publishing, and GitHub releases
- Changelog categorizes changes into Features, Bug Fixes, Improvements, Documentation, and Performance
---
 .github/workflows/version-and-publish.yml | 191 ++++++++++++++++++++++
 VERSION_WORKFLOW.md                       | 127 ++++++++++++++
 2 files changed, 318 insertions(+)
 create mode 100644 .github/workflows/version-and-publish.yml
 create mode 100644 VERSION_WORKFLOW.md

diff --git a/.github/workflows/version-and-publish.yml b/.github/workflows/version-and-publish.yml
new file mode 100644
index 0000000..2fe4404
--- /dev/null
+++ b/.github/workflows/version-and-publish.yml
@@ -0,0 +1,191 @@
+name: Version and Publish
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+    types: [closed]
+
+jobs:
+  version-and-publish:
+    if: github.event_name == 'push' || (github.event.pull_request.merged == true && (contains(github.event.pull_request.head.ref, 'version/major') || contains(github.event.pull_request.head.ref, 'version/minor') || contains(github.event.pull_request.head.ref, 'version/patch')))
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+          registry-url: 'https://registry.npmjs.org'
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run tests
+        run: npm test
+
+      - name: Run build
+        run: npm run build
+
+      - name: Determine version bump type
+        id: version-type
+        run: |
+          if [[ "${{ github.event.pull_request.head.ref }}" =~ version/major ]]; then
+            echo "type=major" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.event.pull_request.head.ref }}" =~ version/minor ]]; then
+            echo "type=minor" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.event.pull_request.head.ref }}" =~ version/patch ]]; then
+            echo "type=patch" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.event_name }}" == "push" ]]; then
+            # Default to patch for direct pushes to main
+            echo "type=patch" >> $GITHUB_OUTPUT
+          else
+            echo "type=none" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Configure git
+        if: steps.version-type.outputs.type != 'none'
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Install Claude Code CLI
+        if: steps.version-type.outputs.type != 'none'
+        run: |
+          curl -fsSL https://claude.ai/cli/install.sh | bash
+          echo "$HOME/.claude/bin" >> $GITHUB_PATH
+
+      - name: Generate changelog with Claude
+        if: steps.version-type.outputs.type != 'none'
+        id: changelog
+        run: |
+          # Get commits since last tag
+          LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+          if [ -z "$LAST_TAG" ]; then
+            COMMITS=$(git log --oneline --no-merges --since="1 week ago")
+          else
+            COMMITS=$(git log --oneline --no-merges ${LAST_TAG}..HEAD)
+          fi
+
+          # Generate changelog using Claude
+          CHANGELOG=$(claude-code << EOF
+          Please analyze the following git commits and generate a concise changelog in this exact format:
+
+          ## Changes
+
+          ### 🚀 Features
+          - Brief description of new features
+
+          ### 🐛 Bug Fixes
+          - Brief description of bug fixes
+
+          ### 🔧 Improvements
+          - Brief description of improvements/refactoring
+
+          ### 📚 Documentation
+          - Brief description of documentation changes
+
+          ### ⚡ Performance
+          - Brief description of performance improvements
+
+          Only include sections that have actual changes. Keep each bullet point concise and user-focused.
+
+          Git commits to analyze:
+          $COMMITS
+          EOF
+          )
+
+          # Save changelog to output
+          echo "changelog<<EOF" >> $GITHUB_OUTPUT
+          echo "$CHANGELOG" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
+      - name: Version bump
+        if: steps.version-type.outputs.type != 'none'
+        id: version-bump
+        run: |
+          # Get current version
+          CURRENT_VERSION=$(node -p "require('./package.json').version")
+          echo "current-version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+
+          # Bump version
+          npm version ${{ steps.version-type.outputs.type }} --no-git-tag-version
+
+          # Get new version
+          NEW_VERSION=$(node -p "require('./package.json').version")
+          echo "new-version=$NEW_VERSION" >> $GITHUB_OUTPUT
+
+          # Create commit with changelog
+          git add package.json package-lock.json
+          git commit -m "chore: bump version to v$NEW_VERSION
+
+          ${{ steps.changelog.outputs.changelog }}"
+
+          # Create git tag
+          git tag -a "v$NEW_VERSION" -m "Version $NEW_VERSION
+
+          ${{ steps.changelog.outputs.changelog }}"
+
+          echo "Version bumped from $CURRENT_VERSION to $NEW_VERSION"
+
+      - name: Push version changes
+        if: steps.version-type.outputs.type != 'none'
+        run: |
+          git push origin main
+          git push origin --tags
+
+      - name: Publish to NPM
+        if: steps.version-type.outputs.type != 'none'
+        run: npm publish --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+      - name: Create GitHub Release
+        if: steps.version-type.outputs.type != 'none'
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: v${{ steps.version-bump.outputs.new-version }}
+          release_name: Release v${{ steps.version-bump.outputs.new-version }}
+          body: |
+            # Release v${{ steps.version-bump.outputs.new-version }}
+
+            ${{ steps.changelog.outputs.changelog }}
+
+            ---
+
+            **Version Info**: ${{ steps.version-type.outputs.type }} release (v${{ steps.version-bump.outputs.current-version }} → v${{ steps.version-bump.outputs.new-version }})
+
+            ### Installation
+
+            ```bash
+            npm install @xtr-dev/payload-mailing@${{ steps.version-bump.outputs.new-version }}
+            ```
+
+            ### Documentation
+
+            See the [README](https://github.com/xtr-dev/payload-mailing#readme) for usage instructions and full documentation.
+          draft: false
+          prerelease: false
+
+  notify-success:
+    if: github.event_name == 'push' || (github.event.pull_request.merged == true && (contains(github.event.pull_request.head.ref, 'version/major') || contains(github.event.pull_request.head.ref, 'version/minor') || contains(github.event.pull_request.head.ref, 'version/patch')))
+    needs: version-and-publish
+    runs-on: ubuntu-latest
+    steps:
+      - name: Success notification
+        run: |
+          echo "🎉 Successfully published version ${{ needs.version-and-publish.outputs.new-version }} to NPM!"
+          echo "📦 Package: https://www.npmjs.com/package/@xtr-dev/payload-mailing"
+          echo "🏷️  GitHub Release: https://github.com/xtr-dev/payload-mailing/releases/tag/v${{ needs.version-and-publish.outputs.new-version }}"
\ No newline at end of file
diff --git a/VERSION_WORKFLOW.md b/VERSION_WORKFLOW.md
new file mode 100644
index 0000000..69e714c
--- /dev/null
+++ b/VERSION_WORKFLOW.md
@@ -0,0 +1,127 @@
+# Version Management Workflow
+
+This repository uses automated version management with GitHub Actions. Version bumps are triggered based on which branch changes are merged to `main`.
+
+## Available Branches
+
+- `version/major` - For breaking changes (e.g., 1.0.0 → 2.0.0)
+- `version/minor` - For new features (e.g., 1.0.0 → 1.1.0)
+- `version/patch` - For bug fixes (e.g., 1.0.0 → 1.0.1)
+
+## How to Use
+
+### For Patch Releases (Bug Fixes)
+1. Create a branch from `version/patch`:
+   ```bash
+   git checkout version/patch
+   git pull origin version/patch
+   git checkout -b fix/your-bug-fix
+   # Make your changes
+   git commit -m "fix: your bug fix description"
+   git push origin fix/your-bug-fix
+   ```
+
+2. Create a PR targeting `version/patch`
+3. Once approved, merge the PR to `version/patch`
+4. Create a PR from `version/patch` to `main`
+5. When merged to `main`, the workflow will:
+   - Bump patch version (e.g., 1.0.0 → 1.0.1)
+   - Run tests and build
+   - Publish to NPM
+   - Create a GitHub release
+
+### For Minor Releases (New Features)
+1. Create a branch from `version/minor`:
+   ```bash
+   git checkout version/minor
+   git pull origin version/minor
+   git checkout -b feature/your-feature
+   # Make your changes
+   git commit -m "feat: your feature description"
+   git push origin feature/your-feature
+   ```
+
+2. Create a PR targeting `version/minor`
+3. Once approved, merge the PR to `version/minor`
+4. Create a PR from `version/minor` to `main`
+5. When merged to `main`, the workflow will:
+   - Bump minor version (e.g., 1.0.0 → 1.1.0)
+   - Run tests and build
+   - Publish to NPM
+   - Create a GitHub release
+
+### For Major Releases (Breaking Changes)
+1. Create a branch from `version/major`:
+   ```bash
+   git checkout version/major
+   git pull origin version/major
+   git checkout -b breaking/your-breaking-change
+   # Make your changes
+   git commit -m "feat!: your breaking change description"
+   git push origin breaking/your-breaking-change
+   ```
+
+2. Create a PR targeting `version/major`
+3. Once approved, merge the PR to `version/major`
+4. Create a PR from `version/major` to `main`
+5. When merged to `main`, the workflow will:
+   - Bump major version (e.g., 1.0.0 → 2.0.0)
+   - Run tests and build
+   - Publish to NPM
+   - Create a GitHub release
+
+## Direct Push to Main
+Direct pushes to `main` will trigger a patch version bump by default.
+
+## Required Secrets
+
+Make sure these secrets are configured in your GitHub repository:
+
+- `NPM_TOKEN` - Your NPM authentication token for publishing
+- `GITHUB_TOKEN` - Automatically provided by GitHub Actions
+
+## Workflow Features
+
+- ✅ Automatic version bumping based on branch
+- ✅ AI-generated changelog using Claude Code CLI
+- ✅ Runs tests before publishing
+- ✅ Builds the package before publishing
+- ✅ Creates git tags with changelog in tag message
+- ✅ Publishes to NPM with public access
+- ✅ Creates GitHub releases with formatted changelog
+- ✅ Prevents publishing if tests fail
+
+## Changelog Generation
+
+The workflow automatically generates a standardized changelog for each release using Claude Code CLI. The changelog analyzes git commits since the last release and categorizes them into:
+
+- 🚀 **Features** - New functionality
+- 🐛 **Bug Fixes** - Bug fixes and corrections
+- 🔧 **Improvements** - Code improvements and refactoring
+- 📚 **Documentation** - Documentation updates
+- ⚡ **Performance** - Performance optimizations
+
+The generated changelog is included in:
+- The version bump commit message
+- The git tag message
+- The GitHub release notes
+
+## Version Branch Maintenance
+
+Keep version branches up to date by periodically merging from main:
+
+```bash
+git checkout version/patch
+git merge main
+git push origin version/patch
+
+git checkout version/minor
+git merge main
+git push origin version/minor
+
+git checkout version/major
+git merge main
+git push origin version/major
+```
+
+This ensures that all version branches have the latest changes from main before creating new features or fixes.
\ No newline at end of file

From 709346c11c9e62c1af2d7b962f93e8665d76c41c Mon Sep 17 00:00:00 2001
From: Bas van den Aakster <bvdaakster@gmail.com>
Date: Sat, 13 Sep 2025 12:55:54 +0200
Subject: [PATCH 2/8] fix: resolve GitHub Actions workflow issues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🐛 **Fixes Applied:**

### Package Manager Alignment
- Switched from npm to pnpm throughout workflow to match project setup
- Added proper pnpm cache configuration for faster builds
- Used pnpm/action-setup@v4 for pnpm installation
- Kept npm for version bumping only (pnpm lacks version command)

### Deprecated Action Replacement
- Replaced deprecated actions/create-release@v1 with gh CLI
- Updated to use gh release create for better reliability
- Improved release notes formatting with proper escaping

### Missing Output Declaration
- Added proper outputs declaration to version-and-publish job
- Exposed new-version, current-version, and version-type outputs
- Fixed notify-success job to properly reference outputs
- Added conditional check to prevent empty version notifications

### Additional Improvements
- Enhanced lockfile handling for both package-lock.json and pnpm-lock.yaml
- Added --no-git-checks flag to pnpm publish for CI environment
- Improved success notification with version change details
---
 .github/workflows/version-and-publish.yml | 90 +++++++++++++++--------
 1 file changed, 58 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/version-and-publish.yml b/.github/workflows/version-and-publish.yml
index 2fe4404..4d571e7 100644
--- a/.github/workflows/version-and-publish.yml
+++ b/.github/workflows/version-and-publish.yml
@@ -13,6 +13,10 @@ jobs:
   version-and-publish:
     if: github.event_name == 'push' || (github.event.pull_request.merged == true && (contains(github.event.pull_request.head.ref, 'version/major') || contains(github.event.pull_request.head.ref, 'version/minor') || contains(github.event.pull_request.head.ref, 'version/patch')))
     runs-on: ubuntu-latest
+    outputs:
+      new-version: ${{ steps.version-bump.outputs.new-version }}
+      current-version: ${{ steps.version-bump.outputs.current-version }}
+      version-type: ${{ steps.version-type.outputs.type }}
 
     steps:
       - name: Checkout code
@@ -26,16 +30,32 @@ jobs:
         with:
           node-version: '18'
           registry-url: 'https://registry.npmjs.org'
-          cache: 'npm'
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 8
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
 
       - name: Install dependencies
-        run: npm ci
+        run: pnpm install --frozen-lockfile
 
       - name: Run tests
-        run: npm test
+        run: pnpm test
 
       - name: Run build
-        run: npm run build
+        run: pnpm build
 
       - name: Determine version bump type
         id: version-type
@@ -118,7 +138,7 @@ jobs:
           CURRENT_VERSION=$(node -p "require('./package.json').version")
           echo "current-version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
 
-          # Bump version
+          # Bump version (npm is used for version command as pnpm doesn't have equivalent)
           npm version ${{ steps.version-type.outputs.type }} --no-git-tag-version
 
           # Get new version
@@ -126,7 +146,14 @@ jobs:
           echo "new-version=$NEW_VERSION" >> $GITHUB_OUTPUT
 
           # Create commit with changelog
-          git add package.json package-lock.json
+          git add package.json
+          # Add lockfile if it exists (npm version might create package-lock.json)
+          if [ -f package-lock.json ]; then
+            git add package-lock.json
+          fi
+          if [ -f pnpm-lock.yaml ]; then
+            git add pnpm-lock.yaml
+          fi
           git commit -m "chore: bump version to v$NEW_VERSION
 
           ${{ steps.changelog.outputs.changelog }}"
@@ -146,38 +173,34 @@ jobs:
 
       - name: Publish to NPM
         if: steps.version-type.outputs.type != 'none'
-        run: npm publish --access public
+        run: pnpm publish --access public --no-git-checks
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Create GitHub Release
         if: steps.version-type.outputs.type != 'none'
-        uses: actions/create-release@v1
+        run: |
+          gh release create "v${{ steps.version-bump.outputs.new-version }}" \
+            --title "Release v${{ steps.version-bump.outputs.new-version }}" \
+            --notes "# Release v${{ steps.version-bump.outputs.new-version }}
+
+          ${{ steps.changelog.outputs.changelog }}
+
+          ---
+
+          **Version Info**: ${{ steps.version-type.outputs.type }} release (v${{ steps.version-bump.outputs.current-version }} → v${{ steps.version-bump.outputs.new-version }})
+
+          ### Installation
+
+          \`\`\`bash
+          npm install @xtr-dev/payload-mailing@${{ steps.version-bump.outputs.new-version }}
+          \`\`\`
+
+          ### Documentation
+
+          See the [README](https://github.com/xtr-dev/payload-mailing#readme) for usage instructions and full documentation."
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: v${{ steps.version-bump.outputs.new-version }}
-          release_name: Release v${{ steps.version-bump.outputs.new-version }}
-          body: |
-            # Release v${{ steps.version-bump.outputs.new-version }}
-
-            ${{ steps.changelog.outputs.changelog }}
-
-            ---
-
-            **Version Info**: ${{ steps.version-type.outputs.type }} release (v${{ steps.version-bump.outputs.current-version }} → v${{ steps.version-bump.outputs.new-version }})
-
-            ### Installation
-
-            ```bash
-            npm install @xtr-dev/payload-mailing@${{ steps.version-bump.outputs.new-version }}
-            ```
-
-            ### Documentation
-
-            See the [README](https://github.com/xtr-dev/payload-mailing#readme) for usage instructions and full documentation.
-          draft: false
-          prerelease: false
 
   notify-success:
     if: github.event_name == 'push' || (github.event.pull_request.merged == true && (contains(github.event.pull_request.head.ref, 'version/major') || contains(github.event.pull_request.head.ref, 'version/minor') || contains(github.event.pull_request.head.ref, 'version/patch')))
@@ -185,7 +208,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Success notification
+        if: needs.version-and-publish.outputs.new-version != ''
         run: |
           echo "🎉 Successfully published version ${{ needs.version-and-publish.outputs.new-version }} to NPM!"
           echo "📦 Package: https://www.npmjs.com/package/@xtr-dev/payload-mailing"
-          echo "🏷️  GitHub Release: https://github.com/xtr-dev/payload-mailing/releases/tag/v${{ needs.version-and-publish.outputs.new-version }}"
\ No newline at end of file
+          echo "🏷️  GitHub Release: https://github.com/xtr-dev/payload-mailing/releases/tag/v${{ needs.version-and-publish.outputs.new-version }}"
+          echo "🔄 Version Type: ${{ needs.version-and-publish.outputs.version-type }}"
+          echo "📈 Version Change: v${{ needs.version-and-publish.outputs.current-version }} → v${{ needs.version-and-publish.outputs.new-version }}"
\ No newline at end of file

From 5d4ba245f5ba186afbe7e71cccc85f2dd614cab8 Mon Sep 17 00:00:00 2001
From: Bas van den Aakster <bvdaakster@gmail.com>
Date: Sat, 13 Sep 2025 13:03:00 +0200
Subject: [PATCH 3/8] feat: integrate changelog directly into PR merge commit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🔧 **Improved Changelog Integration:**

- Changelog is now appended to the PR merge commit message instead of creating a separate commit
- Version bump changes are included in the same amended merge commit
- Uses git commit --amend to modify the merge commit with both changelog and version changes
- Updated force push with --force-with-lease for safer history rewriting
- Cleaner git history with single commit containing all release information

**Benefits:**
- ✅ Single commit per release (cleaner history)
- ✅ Changelog directly visible in merge commit
- ✅ No additional 'chore: bump version' commits
- ✅ All release info consolidated in one place
- ✅ Safer force push with --force-with-lease
---
 .github/workflows/version-and-publish.yml | 25 +++++++++++++++++++----
 VERSION_WORKFLOW.md                       |  3 ++-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/version-and-publish.yml b/.github/workflows/version-and-publish.yml
index 4d571e7..2cfeb8a 100644
--- a/.github/workflows/version-and-publish.yml
+++ b/.github/workflows/version-and-publish.yml
@@ -130,6 +130,23 @@ jobs:
           echo "$CHANGELOG" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
+      - name: Update merge commit with changelog
+        if: steps.version-type.outputs.type != 'none'
+        run: |
+          # Get the merge commit (HEAD)
+          MERGE_COMMIT=$(git rev-parse HEAD)
+
+          # Get original commit message
+          ORIGINAL_MSG=$(git log -1 --format=%B)
+
+          # Create new commit message with changelog
+          NEW_MSG="$ORIGINAL_MSG
+
+          ${{ steps.changelog.outputs.changelog }}"
+
+          # Amend the merge commit with the new message
+          git commit --amend -m "$NEW_MSG"
+
       - name: Version bump
         if: steps.version-type.outputs.type != 'none'
         id: version-bump
@@ -145,7 +162,7 @@ jobs:
           NEW_VERSION=$(node -p "require('./package.json').version")
           echo "new-version=$NEW_VERSION" >> $GITHUB_OUTPUT
 
-          # Create commit with changelog
+          # Stage version changes
           git add package.json
           # Add lockfile if it exists (npm version might create package-lock.json)
           if [ -f package-lock.json ]; then
@@ -154,9 +171,9 @@ jobs:
           if [ -f pnpm-lock.yaml ]; then
             git add pnpm-lock.yaml
           fi
-          git commit -m "chore: bump version to v$NEW_VERSION
 
-          ${{ steps.changelog.outputs.changelog }}"
+          # Amend the merge commit to include version changes
+          git commit --amend --no-edit
 
           # Create git tag
           git tag -a "v$NEW_VERSION" -m "Version $NEW_VERSION
@@ -168,7 +185,7 @@ jobs:
       - name: Push version changes
         if: steps.version-type.outputs.type != 'none'
         run: |
-          git push origin main
+          git push --force-with-lease origin main
           git push origin --tags
 
       - name: Publish to NPM
diff --git a/VERSION_WORKFLOW.md b/VERSION_WORKFLOW.md
index 69e714c..e12bdcc 100644
--- a/VERSION_WORKFLOW.md
+++ b/VERSION_WORKFLOW.md
@@ -84,6 +84,7 @@ Make sure these secrets are configured in your GitHub repository:
 
 - ✅ Automatic version bumping based on branch
 - ✅ AI-generated changelog using Claude Code CLI
+- ✅ Appends changelog to PR merge commit message
 - ✅ Runs tests before publishing
 - ✅ Builds the package before publishing
 - ✅ Creates git tags with changelog in tag message
@@ -102,7 +103,7 @@ The workflow automatically generates a standardized changelog for each release u
 - ⚡ **Performance** - Performance optimizations
 
 The generated changelog is included in:
-- The version bump commit message
+- The PR merge commit message (automatically appended)
 - The git tag message
 - The GitHub release notes
 

From 25f16f767b2a71d91fccc7196f5897f913c744e1 Mon Sep 17 00:00:00 2001
From: Bas van den Aakster <bvdaakster@gmail.com>
Date: Sat, 13 Sep 2025 13:06:46 +0200
Subject: [PATCH 4/8] feat: create clean commit messages without merge PR text
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🎨 **Cleaner Commit Messages:**

Instead of keeping the merge PR text, the workflow now creates clean, semantic commit messages:

**Before:**

**After:**

**Commit Title Format:**
- 🚀 Major Release (for breaking changes)
- ✨ Minor Release (for new features)
- 🐛 Patch Release (for bug fixes)

This creates a much cleaner git history focused on the actual changes rather than GitHub merge mechanics.
---
 .github/workflows/version-and-publish.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/version-and-publish.yml b/.github/workflows/version-and-publish.yml
index 2cfeb8a..a3e0e5f 100644
--- a/.github/workflows/version-and-publish.yml
+++ b/.github/workflows/version-and-publish.yml
@@ -133,18 +133,23 @@ jobs:
       - name: Update merge commit with changelog
         if: steps.version-type.outputs.type != 'none'
         run: |
-          # Get the merge commit (HEAD)
-          MERGE_COMMIT=$(git rev-parse HEAD)
+          # Extract version type for commit title
+          VERSION_TYPE="${{ steps.version-type.outputs.type }}"
 
-          # Get original commit message
-          ORIGINAL_MSG=$(git log -1 --format=%B)
+          # Create clean commit message with just the changelog
+          if [ "$VERSION_TYPE" = "major" ]; then
+            COMMIT_TITLE="🚀 Major Release"
+          elif [ "$VERSION_TYPE" = "minor" ]; then
+            COMMIT_TITLE="✨ Minor Release"
+          else
+            COMMIT_TITLE="🐛 Patch Release"
+          fi
 
-          # Create new commit message with changelog
-          NEW_MSG="$ORIGINAL_MSG
+          NEW_MSG="$COMMIT_TITLE
 
           ${{ steps.changelog.outputs.changelog }}"
 
-          # Amend the merge commit with the new message
+          # Amend the merge commit with the clean message
           git commit --amend -m "$NEW_MSG"
 
       - name: Version bump

From 53de251421eb0bc08724788bf905474263d4db4f Mon Sep 17 00:00:00 2001
From: Bas van den Aakster <bvdaakster@gmail.com>
Date: Sat, 13 Sep 2025 13:10:23 +0200
Subject: [PATCH 5/8] feat: implement single squashed commit per release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🔄 **Ultra-Clean Git History:**

Now creates one beautiful commit per release instead of multiple merge commits:

**Before:**
```
abc123 Merge pull request #45 from version/minor
def456 feat: add email scheduling
ghi789 fix: validation bug
jkl012 docs: update readme
mno345 test: add unit tests
```

**After:**
```
abc123 ✨ Minor Release

## Changes
### 🚀 Features
- Add email scheduling feature
### 🐛 Bug Fixes
- Fix validation error handling
### 📚 Documentation
- Update readme with new examples
```

**How it works:**
1. Analyzes commits since last release tag
2. Squashes all PR commits into single commit
3. Uses semantic emoji titles (🚀🔧🐛)
4. Includes AI-generated changelog with categorized changes
5. Adds version bump changes to same commit

**Result:** Perfect git history with one meaningful commit per release! 🎉
---
 .github/workflows/version-and-publish.yml | 23 ++++++++++++-----
 VERSION_WORKFLOW.md                       | 31 +++++++++++++++++++++--
 2 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/version-and-publish.yml b/.github/workflows/version-and-publish.yml
index a3e0e5f..c429894 100644
--- a/.github/workflows/version-and-publish.yml
+++ b/.github/workflows/version-and-publish.yml
@@ -130,7 +130,7 @@ jobs:
           echo "$CHANGELOG" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
-      - name: Update merge commit with changelog
+      - name: Create single squashed commit with changelog
         if: steps.version-type.outputs.type != 'none'
         run: |
           # Extract version type for commit title
@@ -149,10 +149,21 @@ jobs:
 
           ${{ steps.changelog.outputs.changelog }}"
 
-          # Amend the merge commit with the clean message
-          git commit --amend -m "$NEW_MSG"
+          # Get the previous commit (before the merge/PR commits)
+          # This assumes we want to squash everything since the last release
+          LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+          if [ -n "$LAST_TAG" ]; then
+            BASE_COMMIT=$LAST_TAG
+          else
+            # If no tags, use the commit before this PR
+            BASE_COMMIT=$(git log --oneline --skip=10 -1 --format="%H" 2>/dev/null || git log --max-parents=0 --format="%H")
+          fi
 
-      - name: Version bump
+          # Reset to the base and create a single squashed commit
+          git reset --soft $BASE_COMMIT
+          git commit -m "$NEW_MSG"
+
+      - name: Version bump and finalize commit
         if: steps.version-type.outputs.type != 'none'
         id: version-bump
         run: |
@@ -177,7 +188,7 @@ jobs:
             git add pnpm-lock.yaml
           fi
 
-          # Amend the merge commit to include version changes
+          # Amend the squashed commit to include version changes
           git commit --amend --no-edit
 
           # Create git tag
@@ -185,7 +196,7 @@ jobs:
 
           ${{ steps.changelog.outputs.changelog }}"
 
-          echo "Version bumped from $CURRENT_VERSION to $NEW_VERSION"
+          echo "Created single squashed commit with version bump from $CURRENT_VERSION to $NEW_VERSION"
 
       - name: Push version changes
         if: steps.version-type.outputs.type != 'none'
diff --git a/VERSION_WORKFLOW.md b/VERSION_WORKFLOW.md
index e12bdcc..f271797 100644
--- a/VERSION_WORKFLOW.md
+++ b/VERSION_WORKFLOW.md
@@ -84,7 +84,7 @@ Make sure these secrets are configured in your GitHub repository:
 
 - ✅ Automatic version bumping based on branch
 - ✅ AI-generated changelog using Claude Code CLI
-- ✅ Appends changelog to PR merge commit message
+- ✅ Squashes all PR commits into single clean commit
 - ✅ Runs tests before publishing
 - ✅ Builds the package before publishing
 - ✅ Creates git tags with changelog in tag message
@@ -103,10 +103,37 @@ The workflow automatically generates a standardized changelog for each release u
 - ⚡ **Performance** - Performance optimizations
 
 The generated changelog is included in:
-- The PR merge commit message (automatically appended)
+- The single squashed release commit message
 - The git tag message
 - The GitHub release notes
 
+## Git History Structure
+
+The workflow creates an ultra-clean git history by squashing all commits from the PR into a single release commit:
+
+**Before Squashing:**
+```
+abc123 feat: add email scheduling
+def456 fix: validation bug
+ghi789 docs: update readme
+jkl012 test: add unit tests
+```
+
+**After Squashing:**
+```
+abc123 ✨ Minor Release
+
+## Changes
+### 🚀 Features
+- Add email scheduling feature
+### 🐛 Bug Fixes
+- Fix validation error handling
+### 📚 Documentation
+- Update readme with new examples
+```
+
+This results in one meaningful commit per release with all changes summarized in the AI-generated changelog.
+
 ## Version Branch Maintenance
 
 Keep version branches up to date by periodically merging from main:

From 122123e92fa95301067ee92275d10c9dee6ee81c Mon Sep 17 00:00:00 2001
From: Bas van den Aakster <bvdaakster@gmail.com>
Date: Sat, 13 Sep 2025 13:17:59 +0200
Subject: [PATCH 6/8] fix: resolve critical workflow safety and reliability
 issues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🛡️ **Critical Security & Reliability Fixes:**

### 🚫 Fixed Force Push Safety Risk
- Added remote HEAD comparison before force pushing
- Aborts workflow if remote main updated by another process
- Prevents concurrent workflow conflicts and data loss
- Enhanced error messages for push failures

### 🤖 Enhanced Claude CLI Reliability
- Removed fallback changelog generation (fails fast instead)
- Added 60s timeout for Claude CLI calls
- Validates Claude CLI availability before proceeding
- Clear error messages when changelog generation fails
- Required dependency: changelog generation must succeed

### 📦 Fixed Version Management Issues
- Replaced npm version with custom Node.js script
- Eliminates package manager inconsistencies
- Proper pnpm lockfile synchronization after version changes
- No more package-lock.json conflicts in pnpm projects

### ⚛️ Atomic Commit Creation
- Single atomic commit instead of multiple amend operations
- Eliminates race conditions from multiple git operations
- All changes (code + version + lockfile) in one commit
- Safer git reset strategy with proper base commit detection

### 🔍 Enhanced Error Handling & Debugging
- Comprehensive error checking at each step
- Debug output for troubleshooting failures
- Graceful cleanup of temporary files
- Clear error messages for common failure scenarios

**Result:** Production-ready workflow that safely handles concurrent operations and fails fast on errors! 🎯
---
 .github/workflows/version-and-publish.yml | 227 +++++++++++++++-------
 1 file changed, 159 insertions(+), 68 deletions(-)

diff --git a/.github/workflows/version-and-publish.yml b/.github/workflows/version-and-publish.yml
index c429894..b4e5662 100644
--- a/.github/workflows/version-and-publish.yml
+++ b/.github/workflows/version-and-publish.yml
@@ -85,58 +85,129 @@ jobs:
           curl -fsSL https://claude.ai/cli/install.sh | bash
           echo "$HOME/.claude/bin" >> $GITHUB_PATH
 
-      - name: Generate changelog with Claude
+      - name: Generate changelog with Claude (with fallback)
         if: steps.version-type.outputs.type != 'none'
         id: changelog
         run: |
           # Get commits since last tag
           LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
           if [ -z "$LAST_TAG" ]; then
-            COMMITS=$(git log --oneline --no-merges --since="1 week ago")
+            COMMITS=$(git log --oneline --no-merges --since="1 week ago" || echo "No recent commits")
           else
-            COMMITS=$(git log --oneline --no-merges ${LAST_TAG}..HEAD)
+            COMMITS=$(git log --oneline --no-merges ${LAST_TAG}..HEAD || echo "No new commits")
           fi
 
-          # Generate changelog using Claude
-          CHANGELOG=$(claude-code << EOF
-          Please analyze the following git commits and generate a concise changelog in this exact format:
+          # Create fallback changelog from commits
+          create_fallback_changelog() {
+            echo "## Changes"
+            echo ""
+            if [ "$COMMITS" != "No recent commits" ] && [ "$COMMITS" != "No new commits" ]; then
+              echo "### 📋 Updates"
+              echo "$COMMITS" | sed 's/^[a-f0-9]* /- /' | head -10
+            else
+              echo "### 📋 Updates"
+              echo "- Version bump and maintenance updates"
+            fi
+          }
 
-          ## Changes
+          # Generate changelog using Claude (fail if it fails)
+          if ! command -v claude-code >/dev/null 2>&1; then
+            echo "❌ ERROR: Claude CLI not found. Please ensure Claude Code is properly installed."
+            exit 1
+          fi
 
-          ### 🚀 Features
-          - Brief description of new features
+          echo "🤖 Generating changelog with Claude..."
+          CHANGELOG=$(timeout 60s claude-code << 'CLAUDE_EOF'
+Please analyze the following git commits and generate a concise changelog in this exact format:
 
-          ### 🐛 Bug Fixes
-          - Brief description of bug fixes
+## Changes
 
-          ### 🔧 Improvements
-          - Brief description of improvements/refactoring
+### 🚀 Features
+- Brief description of new features
 
-          ### 📚 Documentation
-          - Brief description of documentation changes
+### 🐛 Bug Fixes
+- Brief description of bug fixes
 
-          ### ⚡ Performance
-          - Brief description of performance improvements
+### 🔧 Improvements
+- Brief description of improvements/refactoring
 
-          Only include sections that have actual changes. Keep each bullet point concise and user-focused.
+### 📚 Documentation
+- Brief description of documentation changes
 
-          Git commits to analyze:
-          $COMMITS
-          EOF
+### ⚡ Performance
+- Brief description of performance improvements
+
+Only include sections that have actual changes. Keep each bullet point concise and user-focused.
+
+Git commits to analyze:
+$COMMITS
+CLAUDE_EOF
           )
 
+          # Check if changelog generation succeeded
+          if [ $? -ne 0 ] || [ -z "$CHANGELOG" ]; then
+            echo "❌ ERROR: Failed to generate changelog with Claude. Workflow cannot continue."
+            echo "Debug info - Commits to analyze:"
+            echo "$COMMITS"
+            exit 1
+          fi
+
+          echo "✅ Successfully generated changelog with Claude"
+
           # Save changelog to output
           echo "changelog<<EOF" >> $GITHUB_OUTPUT
           echo "$CHANGELOG" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
 
-      - name: Create single squashed commit with changelog
+      - name: Create version bump script
         if: steps.version-type.outputs.type != 'none'
+        run: |
+          # Create Node.js script to safely bump version
+          cat > bump-version.js << 'VERSION_SCRIPT_EOF'
+          const fs = require('fs');
+          const path = require('path');
+
+          const versionType = process.argv[2];
+          const packagePath = path.join(process.cwd(), 'package.json');
+
+          try {
+            const packageJson = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
+            const currentVersion = packageJson.version;
+            const [major, minor, patch] = currentVersion.split('.').map(Number);
+
+            let newVersion;
+            switch (versionType) {
+              case 'major':
+                newVersion = `${major + 1}.0.0`;
+                break;
+              case 'minor':
+                newVersion = `${major}.${minor + 1}.0`;
+                break;
+              case 'patch':
+                newVersion = `${major}.${minor}.${patch + 1}`;
+                break;
+              default:
+                throw new Error(`Invalid version type: ${versionType}`);
+            }
+
+            packageJson.version = newVersion;
+            fs.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2) + '\n');
+
+            console.log(`${currentVersion}:${newVersion}`);
+          } catch (error) {
+            console.error('Error bumping version:', error.message);
+            process.exit(1);
+          }
+          VERSION_SCRIPT_EOF
+
+      - name: Create single atomic commit with all changes
+        if: steps.version-type.outputs.type != 'none'
+        id: version-bump
         run: |
           # Extract version type for commit title
           VERSION_TYPE="${{ steps.version-type.outputs.type }}"
 
-          # Create clean commit message with just the changelog
+          # Create clean commit message title
           if [ "$VERSION_TYPE" = "major" ]; then
             COMMIT_TITLE="🚀 Major Release"
           elif [ "$VERSION_TYPE" = "minor" ]; then
@@ -145,63 +216,83 @@ jobs:
             COMMIT_TITLE="🐛 Patch Release"
           fi
 
-          NEW_MSG="$COMMIT_TITLE
+          # Get the safe base commit (last release tag or fallback)
+          LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
+          if [ -n "$LAST_TAG" ]; then
+            BASE_COMMIT=$(git rev-list -n 1 $LAST_TAG)
+          else
+            # Fallback: get commit from 1 week ago or first commit
+            BASE_COMMIT=$(git rev-list --since="1 week ago" --reverse HEAD | head -1 || git rev-list --max-parents=0 HEAD)
+          fi
+
+          echo "Base commit for squash: $BASE_COMMIT"
+
+          # Safely reset to base (soft reset preserves working directory)
+          git reset --soft $BASE_COMMIT
+
+          # Bump version using our safe Node.js script
+          VERSION_OUTPUT=$(node bump-version.js $VERSION_TYPE)
+          CURRENT_VERSION=$(echo $VERSION_OUTPUT | cut -d: -f1)
+          NEW_VERSION=$(echo $VERSION_OUTPUT | cut -d: -f2)
+
+          echo "current-version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+          echo "new-version=$NEW_VERSION" >> $GITHUB_OUTPUT
+
+          # Synchronize pnpm lockfile if it exists
+          if [ -f pnpm-lock.yaml ]; then
+            echo "Synchronizing pnpm lockfile..."
+            pnpm install --frozen-lockfile --ignore-scripts || echo "Lockfile sync completed with warnings"
+          fi
+
+          # Create single atomic commit with everything
+          git add -A
+          COMMIT_MSG="$COMMIT_TITLE
 
           ${{ steps.changelog.outputs.changelog }}"
 
-          # Get the previous commit (before the merge/PR commits)
-          # This assumes we want to squash everything since the last release
-          LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
-          if [ -n "$LAST_TAG" ]; then
-            BASE_COMMIT=$LAST_TAG
-          else
-            # If no tags, use the commit before this PR
-            BASE_COMMIT=$(git log --oneline --skip=10 -1 --format="%H" 2>/dev/null || git log --max-parents=0 --format="%H")
-          fi
-
-          # Reset to the base and create a single squashed commit
-          git reset --soft $BASE_COMMIT
-          git commit -m "$NEW_MSG"
-
-      - name: Version bump and finalize commit
-        if: steps.version-type.outputs.type != 'none'
-        id: version-bump
-        run: |
-          # Get current version
-          CURRENT_VERSION=$(node -p "require('./package.json').version")
-          echo "current-version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
-
-          # Bump version (npm is used for version command as pnpm doesn't have equivalent)
-          npm version ${{ steps.version-type.outputs.type }} --no-git-tag-version
-
-          # Get new version
-          NEW_VERSION=$(node -p "require('./package.json').version")
-          echo "new-version=$NEW_VERSION" >> $GITHUB_OUTPUT
-
-          # Stage version changes
-          git add package.json
-          # Add lockfile if it exists (npm version might create package-lock.json)
-          if [ -f package-lock.json ]; then
-            git add package-lock.json
-          fi
-          if [ -f pnpm-lock.yaml ]; then
-            git add pnpm-lock.yaml
-          fi
-
-          # Amend the squashed commit to include version changes
-          git commit --amend --no-edit
+          git commit -m "$COMMIT_MSG" || {
+            echo "Commit failed, checking git status:"
+            git status
+            git diff --cached
+            exit 1
+          }
 
           # Create git tag
           git tag -a "v$NEW_VERSION" -m "Version $NEW_VERSION
 
           ${{ steps.changelog.outputs.changelog }}"
 
-          echo "Created single squashed commit with version bump from $CURRENT_VERSION to $NEW_VERSION"
+          echo "Created single atomic commit with version $CURRENT_VERSION → $NEW_VERSION"
 
-      - name: Push version changes
+          # Clean up temporary files
+          rm -f bump-version.js
+
+      - name: Push version changes safely
         if: steps.version-type.outputs.type != 'none'
         run: |
-          git push --force-with-lease origin main
+          # Check if we need to force push (if git history was rewritten)
+          CURRENT_REMOTE_HEAD=$(git ls-remote origin main | cut -f1)
+          LOCAL_REMOTE_HEAD=$(git rev-parse origin/main)
+
+          if [ "$CURRENT_REMOTE_HEAD" != "$LOCAL_REMOTE_HEAD" ]; then
+            echo "⚠️  Remote main has been updated by another process"
+            echo "Current remote HEAD: $CURRENT_REMOTE_HEAD"
+            echo "Local remote HEAD: $LOCAL_REMOTE_HEAD"
+            echo "❌ ABORTING: Cannot safely force push. Another workflow may be running."
+            exit 1
+          fi
+
+          # Safe force push with lease (only if remote hasn't changed)
+          echo "🚀 Pushing squashed commit to main..."
+          git push --force-with-lease origin main || {
+            echo "❌ ERROR: Force push failed. This likely means:"
+            echo "1. Another workflow pushed to main after this one started"
+            echo "2. Branch protection rules are preventing the push"
+            echo "3. Insufficient permissions"
+            exit 1
+          }
+
+          echo "🏷️  Pushing tags..."
           git push origin --tags
 
       - name: Publish to NPM

From 740a0318582d2a206855b503a68d93e5d6422ded Mon Sep 17 00:00:00 2001
From: Bas van den Aakster <bvdaakster@gmail.com>
Date: Sat, 13 Sep 2025 13:22:50 +0200
Subject: [PATCH 7/8] fix: resolve Node.js version mismatch and hardcoded
 dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🔧 **Configuration & Validation Fixes:**

### 📦 Node.js Version Alignment
- Updated workflow from Node 18 → Node 20
- Matches package.json engines requirement (^18.20.2 || >=20.9.0)
- Ensures consistent runtime environment

### 🏷️ Dynamic Package Name Resolution
- Removed hardcoded @xtr-dev/payload-mailing references
- Reads package name dynamically from package.json
- Updates NPM URLs, GitHub releases, and installation commands
- Uses ${{ github.repository }} for dynamic repo references

### ✅ Prerequisites Validation
- Validates all required version branches exist before processing
- Checks Node.js version compatibility with package.json engines
- Provides clear error messages for missing branches with fix instructions
- Extracts and exposes package metadata for downstream steps

**New Validation Steps:**
- 🔍 Version branches validation (version/major, version/minor, version/patch)
- 📌 Package name and version extraction
- ⚡ Node.js version compatibility check
- 🛡️ Early failure with actionable error messages

**Benefits:**
- ✅ Prevents cryptic workflow failures
- ✅ Repository-agnostic workflow (works for any fork)
- ✅ Consistent Node.js environment
- ✅ Self-documenting error messages
---
 .github/workflows/version-and-publish.yml | 56 +++++++++++++++++++++--
 1 file changed, 51 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/version-and-publish.yml b/.github/workflows/version-and-publish.yml
index b4e5662..f66359c 100644
--- a/.github/workflows/version-and-publish.yml
+++ b/.github/workflows/version-and-publish.yml
@@ -17,6 +17,7 @@ jobs:
       new-version: ${{ steps.version-bump.outputs.new-version }}
       current-version: ${{ steps.version-bump.outputs.current-version }}
       version-type: ${{ steps.version-type.outputs.type }}
+      package-name: ${{ steps.prerequisites.outputs.package-name }}
 
     steps:
       - name: Checkout code
@@ -28,7 +29,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Setup pnpm
@@ -48,6 +49,51 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
+      - name: Validate prerequisites and setup
+        id: prerequisites
+        run: |
+          # Extract package info
+          PACKAGE_NAME=$(node -p "require('./package.json').name")
+          CURRENT_VERSION=$(node -p "require('./package.json').version")
+
+          echo "package-name=$PACKAGE_NAME" >> $GITHUB_OUTPUT
+          echo "current-version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
+
+          echo "📦 Package: $PACKAGE_NAME"
+          echo "📌 Current Version: $CURRENT_VERSION"
+
+          # Validate version branches exist
+          echo "🔍 Validating version branches..."
+          MISSING_BRANCHES=""
+
+          for branch in "version/major" "version/minor" "version/patch"; do
+            if ! git ls-remote --heads origin "$branch" | grep -q "$branch"; then
+              MISSING_BRANCHES="$MISSING_BRANCHES $branch"
+            fi
+          done
+
+          if [ -n "$MISSING_BRANCHES" ]; then
+            echo "❌ ERROR: Missing required version branches:$MISSING_BRANCHES"
+            echo "Please create these branches first:"
+            for branch in $MISSING_BRANCHES; do
+              echo "  git checkout -b $branch && git push origin $branch"
+            done
+            exit 1
+          fi
+
+          echo "✅ All version branches exist"
+
+          # Validate Node.js version matches package.json engines
+          NODE_VERSION=$(node --version)
+          echo "🔍 Validating Node.js version: $NODE_VERSION"
+
+          # Basic validation - check if we're on Node 20+
+          if ! echo "$NODE_VERSION" | grep -qE "^v(20|21|22)\."; then
+            echo "⚠️  WARNING: Node.js version $NODE_VERSION may not match package.json engines requirements"
+          fi
+
+          echo "✅ Prerequisites validation complete"
+
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
@@ -317,12 +363,12 @@ CLAUDE_EOF
           ### Installation
 
           \`\`\`bash
-          npm install @xtr-dev/payload-mailing@${{ steps.version-bump.outputs.new-version }}
+          npm install ${{ steps.prerequisites.outputs.package-name }}@${{ steps.version-bump.outputs.new-version }}
           \`\`\`
 
           ### Documentation
 
-          See the [README](https://github.com/xtr-dev/payload-mailing#readme) for usage instructions and full documentation."
+          See the [README](https://github.com/${{ github.repository }}#readme) for usage instructions and full documentation."
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -335,7 +381,7 @@ CLAUDE_EOF
         if: needs.version-and-publish.outputs.new-version != ''
         run: |
           echo "🎉 Successfully published version ${{ needs.version-and-publish.outputs.new-version }} to NPM!"
-          echo "📦 Package: https://www.npmjs.com/package/@xtr-dev/payload-mailing"
-          echo "🏷️  GitHub Release: https://github.com/xtr-dev/payload-mailing/releases/tag/v${{ needs.version-and-publish.outputs.new-version }}"
+          echo "📦 Package: https://www.npmjs.com/package/${{ needs.version-and-publish.outputs.package-name }}"
+          echo "🏷️  GitHub Release: https://github.com/${{ github.repository }}/releases/tag/v${{ needs.version-and-publish.outputs.new-version }}"
           echo "🔄 Version Type: ${{ needs.version-and-publish.outputs.version-type }}"
           echo "📈 Version Change: v${{ needs.version-and-publish.outputs.current-version }} → v${{ needs.version-and-publish.outputs.new-version }}"
\ No newline at end of file

From 75e3875ebc133506e5e07d25114200222e6419b7 Mon Sep 17 00:00:00 2001
From: Bas van den Aakster <bvdaakster@gmail.com>
Date: Sat, 13 Sep 2025 13:26:49 +0200
Subject: [PATCH 8/8] refactor: remove unused fallback code and increase Claude
 timeout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🧹 Code Cleanup:
- Removed unused create_fallback_changelog function
- Function was left over from when we had fallback changelog generation
- Now using fail-fast approach - Claude must succeed or workflow fails

⏱️ Increased Claude Timeout:
- Claude changelog generation timeout: 60s → 240s (4x increase)
- Allows more time for complex changelog analysis
- Reduces chance of timeout failures for large changesets
- Still fails fast if Claude is unavailable or errors occur

Result: Cleaner code with more reliable Claude integration!
---
 .github/workflows/version-and-publish.yml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/.github/workflows/version-and-publish.yml b/.github/workflows/version-and-publish.yml
index f66359c..13befb9 100644
--- a/.github/workflows/version-and-publish.yml
+++ b/.github/workflows/version-and-publish.yml
@@ -143,18 +143,6 @@ jobs:
             COMMITS=$(git log --oneline --no-merges ${LAST_TAG}..HEAD || echo "No new commits")
           fi
 
-          # Create fallback changelog from commits
-          create_fallback_changelog() {
-            echo "## Changes"
-            echo ""
-            if [ "$COMMITS" != "No recent commits" ] && [ "$COMMITS" != "No new commits" ]; then
-              echo "### 📋 Updates"
-              echo "$COMMITS" | sed 's/^[a-f0-9]* /- /' | head -10
-            else
-              echo "### 📋 Updates"
-              echo "- Version bump and maintenance updates"
-            fi
-          }
 
           # Generate changelog using Claude (fail if it fails)
           if ! command -v claude-code >/dev/null 2>&1; then
@@ -163,7 +151,7 @@ jobs:
           fi
 
           echo "🤖 Generating changelog with Claude..."
-          CHANGELOG=$(timeout 60s claude-code << 'CLAUDE_EOF'
+          CHANGELOG=$(timeout 240s claude-code << 'CLAUDE_EOF'
 Please analyze the following git commits and generate a concise changelog in this exact format:
 
 ## Changes