From 70ee9e246bd417be4810e08f58649bec2f68b29a Mon Sep 17 00:00:00 2001
From: Max Litruv Boonzaayer <litruv@gmail.com>
Date: Fri, 17 Apr 2026 02:16:42 +1000
Subject: [PATCH 1/3] Enable auto-merge for validated PRs

---
 .gitea/workflows/validate-pr.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/validate-pr.yml b/.gitea/workflows/validate-pr.yml
index f9e3108..f32f76b 100644
--- a/.gitea/workflows/validate-pr.yml
+++ b/.gitea/workflows/validate-pr.yml
@@ -27,7 +27,12 @@ jobs:
         run: |
           node .gitea/scripts/validate-pr.js "${{ github.event.pull_request.user.login }}" "${{ steps.changed-files.outputs.files }}"
           
-      - name: Auto-approve if valid
+      - name: Auto-merge PR
         if: success()
         run: |
-          echo "✅ Validation passed - PR is ready to merge"
+          echo "✅ Validation passed - Auto-merging PR"
+          curl -X POST \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            "${{ github.api_url }}/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/merge" \
+            -d '{"merge_method":"squash","commit_title":"${{ github.event.pull_request.title }}","commit_message":"Auto-merged after validation","delete_branch_after_merge":true}'

From 976e275bba8782d218a44327c449eb3838962d9e Mon Sep 17 00:00:00 2001
From: Max Litruv Boonzaayer <litruv@gmail.com>
Date: Fri, 17 Apr 2026 02:22:40 +1000
Subject: [PATCH 2/3] Fix Gitea API merge endpoint

---
 .gitea/workflows/validate-pr.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/validate-pr.yml b/.gitea/workflows/validate-pr.yml
index f32f76b..2b40e59 100644
--- a/.gitea/workflows/validate-pr.yml
+++ b/.gitea/workflows/validate-pr.yml
@@ -32,7 +32,7 @@ jobs:
         run: |
           echo "✅ Validation passed - Auto-merging PR"
           curl -X POST \
-            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
             -H "Content-Type: application/json" \
-            "${{ github.api_url }}/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/merge" \
-            -d '{"merge_method":"squash","commit_title":"${{ github.event.pull_request.title }}","commit_message":"Auto-merged after validation","delete_branch_after_merge":true}'
+            "http://synbox.ruv.wtf:8418/api/v1/repos/litruv/Plugin-Directory/pulls/${{ github.event.pull_request.number }}/merge" \
+            -d '{"Do":"squash","MergeTitleField":"${{ github.event.pull_request.title }}","MergeMessageField":"Auto-merged after validation","delete_branch_after_merge":true}'

From b80ba1132b4a9cb0eeb05ede967f556f86ce12ed Mon Sep 17 00:00:00 2001
From: Max Litruv Boonzaayer <litruv@gmail.com>
Date: Fri, 17 Apr 2026 02:23:54 +1000
Subject: [PATCH 3/3] Use GITHUB_TOKEN for auto-merge

---
 .gitea/workflows/validate-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/validate-pr.yml b/.gitea/workflows/validate-pr.yml
index 2b40e59..ff36ea0 100644
--- a/.gitea/workflows/validate-pr.yml
+++ b/.gitea/workflows/validate-pr.yml
@@ -32,7 +32,7 @@ jobs:
         run: |
           echo "✅ Validation passed - Auto-merging PR"
           curl -X POST \
-            -H "Authorization: token ${{ secrets.GITEA_TOKEN }}" \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
             -H "Content-Type: application/json" \
             "http://synbox.ruv.wtf:8418/api/v1/repos/litruv/Plugin-Directory/pulls/${{ github.event.pull_request.number }}/merge" \
             -d '{"Do":"squash","MergeTitleField":"${{ github.event.pull_request.title }}","MergeMessageField":"Auto-merged after validation","delete_branch_after_merge":true}'