From 998960205e9602efa85079bdb2fcbd24f7ddcd17 Mon Sep 17 00:00:00 2001
From: Matthew Elwell <matthew.elwell@flagsmith.com>
Date: Tue, 2 Jun 2026 19:26:48 +0100
Subject: [PATCH 1/4] ci: Fix Renovate semantic commit scopes

Use pep621 manager (not uv) to match pyproject.toml packages, and set
semanticCommitScope to null globally so unmatched packages fall back to
'deps: ...' rather than 'deps(deps): ...'.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 renovate.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index b9903ca90f42..ed5454399262 100644
--- a/renovate.json
+++ b/renovate.json
@@ -4,9 +4,10 @@
     "security:only-security-updates",
     ":semanticCommitTypeAll(deps)"
   ],
+  "semanticCommitScope": null,
   "packageRules": [
     {
-      "matchManagers": ["uv"],
+      "matchManagers": ["pep621"],
       "matchFileNames": ["api/**"],
       "addLabels": ["api", "dependencies"],
       "semanticCommitScope": "API"

From f5a6ded39c9c4559e44967ac20c6d707cdef21f5 Mon Sep 17 00:00:00 2001
From: Matthew Elwell <matthew.elwell@flagsmith.com>
Date: Wed, 3 Jun 2026 14:37:54 +0100
Subject: [PATCH 2/4] Fix claude hallucinations

---
 renovate.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/renovate.json b/renovate.json
index 90398871e47a..5fa8a887a6c8 100644
--- a/renovate.json
+++ b/renovate.json
@@ -24,7 +24,5 @@
       "semanticCommitScope": "Docs"
     }
   ],
-  "recreateClosed": true,
-  "rebaseWhen": "always",
-  "semanticCommitScope": null
+  "semanticCommitScope": ""
 }

From bd4948cc9d77f82e460fb9a2e9154d1061a916eb Mon Sep 17 00:00:00 2001
From: Matthew Elwell <matthew.elwell@flagsmith.com>
Date: Wed, 3 Jun 2026 14:39:03 +0100
Subject: [PATCH 3/4] Add MCP scope

---
 renovate.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/renovate.json b/renovate.json
index 5fa8a887a6c8..ffac47a5d0f7 100644
--- a/renovate.json
+++ b/renovate.json
@@ -11,6 +11,12 @@
       "addLabels": ["api", "dependencies"],
       "semanticCommitScope": "API"
     },
+    {
+      "matchManagers": ["pep621"],
+      "matchFileNames": ["mcp/**"],
+      "addLabels": ["mcp", "dependencies"],
+      "semanticCommitScope": "MCP"
+    },
     {
       "matchManagers": ["npm"],
       "matchFileNames": ["frontend/**"],

From df8807fe6bd566f2cc60ac7d0c8d9840d5f586e5 Mon Sep 17 00:00:00 2001
From: Matthew Elwell <matthew.elwell@flagsmith.com>
Date: Wed, 3 Jun 2026 14:44:03 +0100
Subject: [PATCH 4/4] Add github actions

---
 renovate.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/renovate.json b/renovate.json
index ffac47a5d0f7..d5a006f794ca 100644
--- a/renovate.json
+++ b/renovate.json
@@ -28,6 +28,12 @@
       "matchFileNames": ["docs/**"],
       "addLabels": ["docs", "dependencies"],
       "semanticCommitScope": "Docs"
+    },
+    {
+      "matchManagers": ["github-actions"],
+      "matchFileNames": [".github/**"],
+      "addLabels": ["ci", "dependencies"],
+      "semanticCommitScope": "CI"
     }
   ],
   "semanticCommitScope": ""