From d06df41c020449a9f27133c9ec0d5dd0c4425100 Mon Sep 17 00:00:00 2001
From: Brendan Kellam <brendan@sourcebot.dev>
Date: Mon, 10 Aug 2026 12:44:09 -0700
Subject: [PATCH 1/3] fix: scope Zoekt changelog updates to Unreleased

---
 .github/scripts/addZoektSyncChangelogEntry.sh | 14 ++++++++------
 .github/scripts/testZoektSync.sh              | 11 +++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/scripts/addZoektSyncChangelogEntry.sh b/.github/scripts/addZoektSyncChangelogEntry.sh
index 85be5f9ac..aa4909f6e 100755
--- a/.github/scripts/addZoektSyncChangelogEntry.sh
+++ b/.github/scripts/addZoektSyncChangelogEntry.sh
@@ -83,12 +83,14 @@ awk -v entry="$entry" '
     next
   }
 
-  in_unreleased && !found_changed && /^## / {
-    print "### Changed"
-    print entry
-    print ""
-    found_changed = 1
-    inserted = 1
+  in_unreleased && /^## / {
+    if (!found_changed) {
+      print "### Changed"
+      print entry
+      print ""
+      found_changed = 1
+      inserted = 1
+    }
     in_unreleased = 0
     print
     next
diff --git a/.github/scripts/testZoektSync.sh b/.github/scripts/testZoektSync.sh
index 1170463cb..043bfe303 100755
--- a/.github/scripts/testZoektSync.sh
+++ b/.github/scripts/testZoektSync.sh
@@ -145,6 +145,14 @@ cat > "$changelog_fixture" <<'EOF'
 - Fixed something.
 
 ## [1.0.0]
+
+### Changed
+- Changed something in a released version.
+
+## [0.9.0]
+
+### Changed
+- Changed something in an older released version.
 EOF
 
 chmod 640 "$changelog_fixture"
@@ -155,6 +163,9 @@ assert_contains "$changelog_fixture" \
 assert_contains "$changelog_fixture" \
   "- Updated the bundled Zoekt version. [#42](https://github.com/sourcebot-dev/sourcebot/pull/42)" \
   "the changelog helper should add the generated PR link"
+entry_count=$(grep -Fc "sourcebot/pull/42" "$changelog_fixture")
+assert_equals "$entry_count" 1 \
+  "the changelog helper should add the PR entry only to Unreleased"
 CHANGELOG_PATH="$changelog_fixture" "$changelog_script" 42
 entry_count=$(grep -Fc "sourcebot/pull/42" "$changelog_fixture")
 assert_equals "$entry_count" 1 \

From 9f8b3e088c12176c8c2eb6da826b66c1165fb455 Mon Sep 17 00:00:00 2001
From: Brendan Kellam <brendan@sourcebot.dev>
Date: Mon, 10 Aug 2026 12:44:40 -0700
Subject: [PATCH 2/3] chore: update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3724be146..bd0c036a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Upgraded `nanoid` to `^3.3.18`. [#1557](https://github.com/sourcebot-dev/sourcebot/pull/1557)
 - Upgraded `dompurify` to `^3.4.13`. [#1556](https://github.com/sourcebot-dev/sourcebot/pull/1556)
 - Upgraded `mermaid` to `^11.16.1`. [#1555](https://github.com/sourcebot-dev/sourcebot/pull/1555)
+- Fixed automated Zoekt changelog updates being added to historical releases. [#1563](https://github.com/sourcebot-dev/sourcebot/pull/1563)
 
 ## [5.1.5] - 2026-07-31
 

From e273e60d3431e9eb1776fbb84725b97c26a0abfa Mon Sep 17 00:00:00 2001
From: Brendan Kellam <brendan@sourcebot.dev>
Date: Mon, 10 Aug 2026 12:47:53 -0700
Subject: [PATCH 3/3] Remove changelog entry for Zoekt updates fix

Removed entry about fixing automated Zoekt changelog updates.
---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd0c036a4..3724be146 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,7 +31,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Upgraded `nanoid` to `^3.3.18`. [#1557](https://github.com/sourcebot-dev/sourcebot/pull/1557)
 - Upgraded `dompurify` to `^3.4.13`. [#1556](https://github.com/sourcebot-dev/sourcebot/pull/1556)
 - Upgraded `mermaid` to `^11.16.1`. [#1555](https://github.com/sourcebot-dev/sourcebot/pull/1555)
-- Fixed automated Zoekt changelog updates being added to historical releases. [#1563](https://github.com/sourcebot-dev/sourcebot/pull/1563)
 
 ## [5.1.5] - 2026-07-31