From 31082723377c60a66f3ac5f18eba1fe9f5981e90 Mon Sep 17 00:00:00 2001
From: chkp-nirm <nirm@checkpoint.com>
Date: Tue, 18 Nov 2025 14:20:36 +0200
Subject: [PATCH 1/3] Enhance dependency update PR creation workflow

---
 .github/workflows/update-dependencies.yml | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml
index cc86f4c..18cdf6a 100644
--- a/.github/workflows/update-dependencies.yml
+++ b/.github/workflows/update-dependencies.yml
@@ -56,8 +56,20 @@ jobs:
           # Create PR with helpful labels and instructions
           gh pr create --title "Update dependencies $(date +%Y-%m-%d)" \
                       --body "Dependency updates and security fixes. Review changes and create changesets if packages need republishing." \
-                      --label "dependencies" \
-                      --label "security"
+                      --label "dependencies"
+          
+          # Enable auto-merge with a delay for safety
+          echo "Waiting 2 minutes before enabling auto-merge..."
+          sleep 120
+          
+          # Get the PR number and enable auto-merge
+          PR_NUMBER=$(gh pr list --head "$BRANCH_NAME" --json number --jq '.[0].number')
+          if [ ! -z "$PR_NUMBER" ]; then
+            gh pr merge $PR_NUMBER --auto --squash --delete-branch
+            echo "Auto-merge enabled for dependency PR #$PR_NUMBER"
+          else
+            echo "Could not find PR to enable auto-merge"
+          fi
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           

From ae9f2880e76881b3d076e9e45b8edb71eedee744 Mon Sep 17 00:00:00 2001
From: chkp-nirm <nirm@checkpoint.com>
Date: Tue, 18 Nov 2025 14:22:17 +0200
Subject: [PATCH 2/3] Implement auto-merge for Version Packages PRs

Added auto-merge step for Version PRs after a delay.
---
 .github/workflows/release.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 34616a5..7d42446 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -94,6 +94,27 @@ jobs:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
           NPM_CONFIG_PROVENANCE: true
 
+      # Auto-merge version PRs after a delay
+      - name: Auto-merge Version PR
+        if: steps.check_lockfile.outputs.lockfile_changed != 'true' && steps.changesets.outputs.hasChangesets == 'true' && steps.changesets.outputs.published != 'true'
+        run: |
+          echo "📋 Version PR was created, setting up auto-merge..."
+          
+          # Wait 5 minutes for any manual review
+          echo "⏳ Waiting 5 minutes before enabling auto-merge..."
+          sleep 300
+          
+          # Find and auto-merge the Version Packages PR
+          PR_NUMBER=$(gh pr list --search "Version Packages" --json number --jq '.[0].number')
+          if [ ! -z "$PR_NUMBER" ] && [ "$PR_NUMBER" != "null" ]; then
+            gh pr merge $PR_NUMBER --auto --squash --delete-branch
+            echo "✅ Auto-merge enabled for Version Packages PR #$PR_NUMBER"
+          else
+            echo "❌ Could not find Version Packages PR to auto-merge"
+          fi
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       # NEW: Create MCPB Release (only when packages are actually published)
       - name: Create MCPB Release
         if: steps.check_lockfile.outputs.lockfile_changed != 'true' && steps.changesets.outputs.published == 'true'

From c8be5e5cd553e9e461f85ef1dd5e89ab170d9723 Mon Sep 17 00:00:00 2001
From: chkp-nirm <nirm@checkpoint.com>
Date: Tue, 18 Nov 2025 14:23:00 +0200
Subject: [PATCH 3/3] Update update-dependencies.yml

---
 .github/workflows/update-dependencies.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml
index 18cdf6a..3b56965 100644
--- a/.github/workflows/update-dependencies.yml
+++ b/.github/workflows/update-dependencies.yml
@@ -59,16 +59,16 @@ jobs:
                       --label "dependencies"
           
           # Enable auto-merge with a delay for safety
-          echo "Waiting 2 minutes before enabling auto-merge..."
+          echo "⏳ Waiting 2 minutes before enabling auto-merge..."
           sleep 120
           
           # Get the PR number and enable auto-merge
           PR_NUMBER=$(gh pr list --head "$BRANCH_NAME" --json number --jq '.[0].number')
           if [ ! -z "$PR_NUMBER" ]; then
             gh pr merge $PR_NUMBER --auto --squash --delete-branch
-            echo "Auto-merge enabled for dependency PR #$PR_NUMBER"
+            echo "✅ Auto-merge enabled for dependency PR #$PR_NUMBER"
           else
-            echo "Could not find PR to enable auto-merge"
+            echo "❌ Could not find PR to enable auto-merge"
           fi
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}