From 8aaf608b4e5a9bead4dd3a4abb060c916281dca6 Mon Sep 17 00:00:00 2001
From: Mark Tkachenko <mark.tkachenko@jetbrains.com>
Date: Fri, 7 Aug 2026 15:16:50 +0200
Subject: [PATCH] ci: fix release flow (#971)

---
 docs/RELEASES.md             |  8 ++++++++
 release-please-config.json   |  4 +++-
 scripts/release-preflight.sh | 25 +++++++++++++++++++++++--
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index e37e057d..cae59c0b 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -64,6 +64,14 @@ Note that `config-file` only takes effect while the workflow does **not** pass a
 `release-type` input to the action — with `release-type` set, the action ignores
 the config entirely. The release type is declared inside the config instead.
 
+Because the config is what is read, it also has to say
+`"include-component-in-tag": false`. Left at its default, release-please derives a
+component from the package name and tags `claude-agent-acp-vX.Y.Z` instead of
+`vX.Y.Z`. That renames the tag every step here looks up, and because no tag under
+the new scheme exists, it also walks the entire commit history into the changelog
+rather than just what landed since the last release. The preflight checks the tag
+release-please is going to use, so this cannot reach a published release.
+
 Releasing 1.0.0 is therefore an explicit act: add `"release-as": "1.0.0"` to
 `release-please-config.json` in its own PR, release, then remove it again.
 
diff --git a/release-please-config.json b/release-please-config.json
index 3def4863..e316bc0f 100644
--- a/release-please-config.json
+++ b/release-please-config.json
@@ -1,10 +1,12 @@
 {
   "bump-minor-pre-major": true,
+  "include-component-in-tag": false,
   "packages": {
     ".": {
       "changelog-path": "CHANGELOG.md",
       "release-type": "node",
-      "bump-minor-pre-major": true
+      "bump-minor-pre-major": true,
+      "include-component-in-tag": false
     }
   },
   "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
diff --git a/scripts/release-preflight.sh b/scripts/release-preflight.sh
index 08c29636..77eaa853 100755
--- a/scripts/release-preflight.sh
+++ b/scripts/release-preflight.sh
@@ -64,8 +64,12 @@ pass "one open release PR: #$pr_number ($pr_title)"
 # release-please reads the version to tag from the PR title, while npm publishes
 # whatever package.json says. If those disagree the tag and the published package
 # describe different releases, so check all three sources against each other.
-case $pr_title in
-*"release "*) title_version=${pr_title##*release } ;;
+# The version is the last field, not everything after 'release': release-please
+# writes the component into the title as 'release <component> X.Y.Z' whenever it
+# is configured to tag with one.
+title_version=${pr_title##* }
+case $title_version in
+[0-9]*.[0-9]*.[0-9]*) ;;
 *) fail "cannot read a version from PR title '$pr_title'." ;;
 esac
 pkg_version=$(gh api "repos/$repo/contents/package.json?ref=$head_ref" \
@@ -81,6 +85,23 @@ if [ "$title_version" != "$pkg_version" ] || [ "$title_version" != "$manifest_ve
 fi
 pass "version agrees across PR title, package.json and manifest: $title_version"
 
+# The tag comes from the config, not from the PR title. With
+# include-component-in-tag left on, release-please tags <component>-vX.Y.Z, which
+# breaks the vX.Y.Z scheme the rest of this script and docs/RELEASES.md rely on,
+# and makes it rewrite the whole history into the changelog because no tag under
+# that scheme exists yet. The compare link it writes into the PR body names the
+# tags it is going to use, so check those rather than trusting the config.
+compare_tag=$(gh pr view "$pr_number" --repo "$repo" --json body --jq '
+  .body | capture("/compare/[^)]*[.][.][.](?<to>[^)\\s]+)").to // ""' 2>/dev/null || true)
+case $compare_tag in
+"" | "v$title_version") ;;
+*) fail "release-please is going to tag '$compare_tag', not 'v$title_version'.
+      Every previous release is tagged vX.Y.Z, and the changelog for #$pr_number
+      covers the whole history rather than just this release, because no tag
+      under that scheme exists. Set 'include-component-in-tag': false in
+      release-please-config.json, then let it rewrite the release PR." ;;
+esac
+
 if gh release view "v$title_version" --repo "$repo" >/dev/null 2>&1; then
   fail "tag v$title_version already exists. Merging would try to release it twice."
 fi