fix(tool): push the tag, wait for a real answer, and number every build

Three defects, each of which let a release look like it had worked.

`--follow-tags` carries annotated tags only, and every release tag here is
lightweight, so it skipped the tag without a word: the branch landed, the
tag stayed local, and the workflow that triggers on it never fired.
v0.8.97-pre.1 was published that way. The tag is pushed by name now, which
works for either kind. The manual sequence in .agents/commands.md had the
same hole and is corrected with it.

The confirmation treated an empty answer as No, and rendering the preview
takes seconds, so a Return pressed while waiting sat in the terminal buffer
until the prompt consumed it and appeared to answer itself. It reads from
/dev/tty and re-asks instead. The bash that ships with macOS is 3.2, which
has neither a fractional read timeout nor a way to flush stdin, so re-asking
is the portable fix rather than draining what is already buffered. Declining
is no longer reported as an error.

The build number was refreshed only when the app version changed, so every
prerelease after the first in a cycle reused its predecessor's. It feeds
Android's versionCode, and two builds carrying the same one cannot be told
apart once installed. Only the build number moves: the app version has to
hold across a cycle because `build --unreleased` keys its commit range off
it, and a prerelease that advanced it would collect the wrong range.

Changelog: skip

Author: chen08209

.agents/commands.md

@@ -167,9 +167,13 @@ Releasing a stable version, in order:
 tool/bump_version.sh all
 dart run tool/changelog.dart release --version 0.8.96
 git commit -am "chore(release): v0.8.96"
-git tag v0.8.96 && git push --follow-tags
+git tag v0.8.96
+git push origin main && git push origin v0.8.96
 ```
 
+Push the tag by name. Every release tag here is lightweight, and `--follow-tags` carries annotated tags only: it skips a
+lightweight one silently, so the branch lands, the tag does not, and the release workflow never fires.
+
 `tool/release.sh` drives both paths so the ordering below cannot be got wrong by hand. It resolves the version (bumping
 the patch when pubspec still names an already tagged one), prints the notes the tag would ship, and only pushes with
 `--push`:

tool/release.sh

@@ -1,19 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# Drives the two release paths documented in .agents/commands.md.
-#
-#   pre     Tag vX.Y.Z-pre.N. CI renders the notes on the fly with
-#           `build --unreleased`, so nothing is written back to the repository
-#           and no release commit is made. Publishes no GitHub release.
-#   stable  Regenerate CHANGELOG.md and changelog.json, commit them, then tag
-#           vX.Y.Z. The commit comes before the tag on purpose: the generated
-#           wording is reviewable in the diff, and `render release` reads the
-#           committed changelog.json for a stable tag.
-#
-# Both paths need `v<pubspec version>` to be untagged: `build --unreleased`
-# refuses to run once it is, and a stable release cannot reuse the tag either.
-
 script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 root="$(cd "$script_dir/.." && pwd)"
 cd "$root"
@@ -89,7 +76,6 @@ pubspec_version() {
   sed -n 's/^version: \([0-9]*\.[0-9]*\.[0-9]*\).*/\1/p' pubspec.yaml
 }
 
-# Tracked files only: an untracked scratch file should not block a release.
 if ! git diff --quiet || ! git diff --cached --quiet; then
   die "working tree has uncommitted changes; commit or stash them first"
 fi
@@ -104,13 +90,10 @@ fi
 current="$(pubspec_version)"
 [[ -n "$current" ]] || die "could not read the version from pubspec.yaml"
 
-# Resolving the version is the same question in both modes: which vX.Y.Z is this
-# release, and is pubspec already pointing at it?
 bumped=0
 if [[ -n "$want_version" ]]; then
   version="$want_version"
 elif git rev-parse -q --verify "refs/tags/v$current" >/dev/null; then
-  # pubspec still names the last release. Take the next patch.
   IFS='.' read -r vmaj vmin vpat <<<"$current"
   version="$vmaj.$vmin.$((vpat + 1))"
   echo "pubspec is at $current, which is already tagged; targeting $version"
@@ -148,11 +131,6 @@ fi
 echo "push      : $([[ $do_push == 1 ]] && echo yes || echo 'no (printed at the end)')"
 echo
 
-# The bump has to happen before the preview: `build --unreleased` reads the
-# pubspec version, and refuses to collect anything while that version is still
-# tagged. Everything from here to the commit is undone on any exit that is not
-# a completed release -- an abort, an error, or a SIGPIPE from a paged preview
-# would otherwise leave pubspec.yaml rewritten for a release that never ran.
 committed=0
 restore() {
   ((committed)) && return 0
@@ -163,13 +141,9 @@ trap restore EXIT
 if ((bumped)); then
   sed -i.bak "s/^version: [0-9]*\.[0-9]*\.[0-9]*/version: $version/" pubspec.yaml
   rm -f pubspec.yaml.bak
-  # bump_version.sh owns the YYYYMMDDNN build number; let it mint today's.
-  tool/bump_version.sh minor
 fi
+tool/bump_version.sh minor
 
-# The notes come from the same v<previous>..HEAD range in both modes, so this
-# preview is what ships either way. `build` writes changelog.json, which a
-# prerelease must not carry, so the file is restored either way.
 echo "--- release notes for $tag ---"
 if dart run tool/changelog.dart build --unreleased >/dev/null 2>&1; then
   dart run tool/changelog.dart render release 2>/dev/null |
@@ -187,8 +161,21 @@ if ((dry_run)); then
 fi
 
 if ((assume_yes == 0)); then
-  read -r -p "Proceed with $tag? [y/N] " reply
-  [[ "$reply" == [yY] ]] || die "aborted"
+  if [[ ! -r /dev/tty ]]; then
+    die "no terminal to confirm on; pass --yes to run unattended"
+  fi
+  while true; do
+    read -r -p "Proceed with $tag? [y/n] " reply </dev/tty ||
+      die "no answer read; pass --yes to run unattended"
+    case "$reply" in
+      [yY] | [yY][eE][sS]) break ;;
+      [nN] | [nN][oO])
+        echo "Cancelled. Nothing was changed."
+        exit 0
+        ;;
+      *) echo "Please answer y or n." ;;
+    esac
+  done
 fi
 
 if [[ "$mode" == "stable" ]]; then
@@ -200,7 +187,7 @@ if [[ "$mode" == "stable" ]]; then
   git commit -m "chore(release): v$version"
   committed=1
   dart run tool/changelog.dart verify
-elif ((bumped)); then
+elif ! git diff --quiet -- pubspec.yaml; then
   git add pubspec.yaml
   git commit -m "chore: bump version to $(sed -n 's/^version: //p' pubspec.yaml)"
   committed=1
@@ -212,10 +199,11 @@ git tag "$tag"
 echo "tagged $tag at $(git rev-parse --short HEAD)"
 
 if ((do_push)); then
-  git push origin "$branch" --follow-tags
+  git push origin "$branch"
+  git push origin "$tag"
   echo "pushed $branch and $tag"
 else
   echo
   echo "Nothing was pushed. To publish:"
-  echo "  git push origin $branch --follow-tags"
+  echo "  git push origin $branch && git push origin $tag"
 fi