fix(release): pre-increment patch version when already tagged

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>

Author: jbachorik

.github/scripts/release.sh

@@ -60,6 +60,16 @@ if [ "$TYPE" == "PATCH" ]; then
     echo "Patch release can be created only for 'release/*' branch."
     exit 1
   fi
+  # First patch after a minor/major release: the current version is already tagged.
+  # Pre-increment the patch so we tag the next version (e.g. 1.40.0 -> 1.40.1).
+  if git rev-parse "v_${BASE}" >/dev/null 2>&1; then
+    if [ -z "$DRYRUN" ]; then
+      ./gradlew incrementVersion --versionIncrementType=PATCH
+      BASE=$(./gradlew printVersion -Psnapshot=false | grep 'Version:' | cut -f2 -d' ')
+    else
+      echo "[DRY-RUN] Version $BASE is already tagged; would pre-increment patch before tagging"
+    fi
+  fi
   RELEASE_BRANCH="release/${BASE%.*}._"
   create_annotated_tag "$BASE" "$TYPE" "$BRANCH"
 fi

.github/workflows/release-validated.yml

@@ -105,8 +105,14 @@ jobs:
               RELEASE_VERSION="$BASE"
             fi
           else
-            # PATCH always increments
-            RELEASE_VERSION="$MAJOR.$MINOR.$((PATCH + 1))"
+            # PATCH: increment only when the current version is already tagged
+            # (first patch after a minor/major release); subsequent patches start
+            # from the already-bumped dev version in build.gradle.kts.
+            if [ "$ALREADY_RELEASED" == "true" ]; then
+              RELEASE_VERSION="$MAJOR.$MINOR.$((PATCH + 1))"
+            else
+              RELEASE_VERSION="$BASE"
+            fi
           fi
 
           # Compute release branch