@seanyao/roll 2026.522.1 → 2026.522.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## v2026.522.2
+
+### Changed
+
+- **Roll 改用 Antigravity (`agy`)** — Google 已退役独立 Gemini CLI，agy 是接班产品；老用户重跑 `roll setup` 即可
+
+### Improved
+
+- **dashboard token 列现在只算 input/output，cache 不再混进来虚抬总量** `[loop]`
+- **`roll loop status` 现在分清「没装 / 装了关了 / 正常」三种状态** — 之前看不出 loop 到底有没有起来 `[loop]`
+
+### Fixed
+
+- **loop 异常中断时未推送的 commit 不再丢** — 自动开成 PR `[loop]`
+- **loop 每小时弹窗不再抢前台焦点** — 后台开 Terminal，不打断你在干的事
+- **`roll loop` 在非 git 目录下不再静默崩溃** `[loop]`
+
 ## v2026.522.1
 
 ### Fixed

package/bin/roll

@@ -4,7 +4,7 @@ set -euo pipefail
 # Roll — AI Agent Convention Manager
 # Single source of truth for how all AI coding agents behave.
 
-VERSION="2026.522.1"
+VERSION="2026.522.2"
 ROLL_HOME="${ROLL_HOME:-${HOME}/.roll}"
 ROLL_CONFIG="${ROLL_HOME}/config.yaml"
 ROLL_GLOBAL="${ROLL_HOME}/conventions/global"
@@ -59,6 +59,9 @@ ai_tool_name() {
   elif [[ "$bn" == "agent" || "$bn" == "workspace" ]]; then
     bn="$(basename "$(dirname "$dir")" | sed 's/^\.//')"
   fi
+  # Antigravity (agy) reuses ~/.gemini/ from the deprecated Gemini CLI for
+  # its config dir, so a literal `gemini` basename now identifies agy.
+  [[ "$bn" == "gemini" ]] && bn="agy"
   echo "$bn"
 }
 
@@ -94,6 +97,123 @@ _is_ai_installed() {
   return 1
 }
 
+# ─── Spinner: TTY-aware status display for long-running steps (US-REL-003) ───
+# _spin_setup [off]
+#   Opens FD 3 for spinner output. Without args: FD 3 → stdout if interactive,
+#   else stderr (best-effort visibility for the operator). With "off": FD 3
+#   → /dev/null, silencing all _spin output (useful for scripts that drive
+#   release.sh in non-interactive contexts but still want exit codes).
+_spin_setup() {
+  if [ "${1:-}" = "off" ]; then
+    exec 3>/dev/null
+    return 0
+  fi
+  if [ -t 1 ]; then
+    # Interactive: spinner shares stdout with normal program output.
+    exec 3>&1
+  else
+    # Non-interactive (stdout redirected to file / piped): route the spinner
+    # trail to stderr so it stays visible in CI logs and never pollutes the
+    # caller's redirected stdout (e.g. > release_notes.txt). FD 3 will be
+    # plain-text mode whenever stderr is also not a TTY.
+    exec 3>&2
+  fi
+}
+
+# _spin <label> <cmd> [args...]
+#   Runs cmd with a status indicator written to FD 3 only. cmd's own
+#   stdout (FD 1) and stderr (FD 2) pass through untouched, so caller-side
+#   `>file` and `2>file` redirections on the _spin call behave normally.
+#
+#   FD 3 is a TTY (or ROLL_SPIN_FORCE_TTY=1):
+#     ⠋ label [Ns]  (refreshed ~10/s, line-cleared with \r\033[2K)
+#     final: ✓ label (Ns)   on success
+#            ✗ label (rc=N, Ns) on failure
+#
+#   FD 3 not a TTY (CI, pipes, `2>&1 | tee`):
+#     » label...   on start
+#     done label (Ns)            on success
+#     fail label (rc=N, Ns)      on failure
+#
+#   Returns wrapped cmd's exit code (transparent under `set -e` callers
+#   when used in `if`/`&&`/`||` contexts).
+_spin() {
+  local _label="$1"
+  shift
+
+  local _spin_tty=0
+  if [ "${ROLL_SPIN_FORCE_TTY:-}" = "1" ] || [ -t 3 ]; then
+    _spin_tty=1
+  fi
+
+  local _spin_start=$SECONDS
+  local _spin_pid=""
+
+  if [ "$_spin_tty" = "1" ]; then
+    # Bash 3.2-safe: indexed array of braille frames.
+    local _spin_frames
+    _spin_frames=( $'\xe2\xa0\x8b' $'\xe2\xa0\x99' $'\xe2\xa0\xb9' $'\xe2\xa0\xb8' $'\xe2\xa0\xbc' $'\xe2\xa0\xb4' $'\xe2\xa0\xa6' $'\xe2\xa0\xa7' $'\xe2\xa0\x87' $'\xe2\xa0\x8f' )
+    # Print initial frame at t=0 so users see something immediately.
+    printf '\r\033[2K%s %s [0s]' "${_spin_frames[0]}" "$_label" >&3 2>/dev/null || true
+    # Only animate when FD 3 is a real TTY — when force-on for tests, skip
+    # the background animator so the test gets deterministic output (the
+    # initial frame, the cleared final frame).
+    if [ -t 3 ]; then
+      (
+        set +e +u 2>/dev/null
+        local _i=1
+        local _t0=$_spin_start
+        while :; do
+          sleep 0.1
+          local _e=$(( SECONDS - _t0 ))
+          printf '\r\033[2K%s %s [%ds]' "${_spin_frames[$_i]}" "$_label" "$_e" >&3 2>/dev/null || true
+          _i=$(( (_i + 1) % 10 ))
+        done
+      ) &
+      _spin_pid=$!
+      # Kill spinner on Ctrl-C / SIGTERM / EXIT. Save no prior trap because
+      # release.sh and its callers install no traps of their own; if a
+      # future caller does, _spin's scope is short and traps are restored
+      # to default after reaping.
+      # shellcheck disable=SC2064
+      trap "kill ${_spin_pid} 2>/dev/null; wait ${_spin_pid} 2>/dev/null; trap - INT TERM EXIT; exit 130" INT TERM
+      # shellcheck disable=SC2064
+      trap "kill ${_spin_pid} 2>/dev/null; wait ${_spin_pid} 2>/dev/null" EXIT
+    fi
+  else
+    printf '» %s...\n' "$_label" >&3 2>/dev/null || true
+  fi
+
+  local _spin_rc=0
+  if [ "$#" -gt 0 ]; then
+    "$@" || _spin_rc=$?
+  fi
+
+  if [ -n "$_spin_pid" ]; then
+    kill "$_spin_pid" 2>/dev/null || true
+    wait "$_spin_pid" 2>/dev/null || true
+    trap - INT TERM EXIT
+  fi
+
+  local _spin_elapsed=$(( SECONDS - _spin_start ))
+
+  if [ "$_spin_tty" = "1" ]; then
+    if [ "$_spin_rc" -eq 0 ]; then
+      printf '\r\033[2K✓ %s (%ds)\n' "$_label" "$_spin_elapsed" >&3 2>/dev/null || true
+    else
+      printf '\r\033[2K✗ %s (rc=%d, %ds)\n' "$_label" "$_spin_rc" "$_spin_elapsed" >&3 2>/dev/null || true
+    fi
+  else
+    if [ "$_spin_rc" -eq 0 ]; then
+      printf 'done %s (%ds)\n' "$_label" "$_spin_elapsed" >&3 2>/dev/null || true
+    else
+      printf 'fail %s (rc=%d, %ds)\n' "$_label" "$_spin_rc" "$_spin_elapsed" >&3 2>/dev/null || true
+    fi
+  fi
+
+  return "$_spin_rc"
+}
+
 # ─── Helper: read config value ───────────────────────────────────────────────
 config_get() {
   local key="$1"
@@ -136,7 +256,7 @@ _ensure_config_entries() {
 
   local -a default_keys=(
     "ai_claude:~/.claude|CLAUDE.md|CLAUDE.md"
-    "ai_gemini:~/.gemini|GEMINI.md|GEMINI.md"
+    "ai_agy:~/.gemini|GEMINI.md|GEMINI.md"
     "ai_kimi:~/.kimi|AGENTS.md|AGENTS.md"
     "ai_codex:~/.codex|AGENTS.md|AGENTS.md"
     "ai_cursor:~/.cursor|.cursor-rules|.cursor-rules"
@@ -2495,19 +2615,23 @@ _peer_route() {
 }
 
 # Open a Terminal.app window attached to the given tmux session (peer
-# auto-attach). No-ops when muted, non-macOS, or osascript unavailable.
+# auto-attach). No-ops when muted or non-macOS.
 # FIX-054: terminal selection removed — always dispatches to macOS
 # Terminal.app for predictability (per-user detection silently failed on
 # Ghostty upgrades).
+# Uses `open -g` so the window appears in the background and does not steal
+# focus from the user's active app (replaces a prior osascript-based
+# capture-frontmost / restore-focus dance that triggered LaunchServices
+# "where is <app>" prompts when the active process name differed from its
+# .app bundle name, e.g. MSTeams vs Microsoft Teams.app).
 _peer_auto_attach() {
   local session="$1"
   [ "$(uname)" = "Darwin" ] || return 0
   [ -f "$_LOOP_MUTE_FILE" ] && return 0
-  command -v osascript >/dev/null 2>&1 || return 0
-  osascript \
-    -e 'tell application "System Events" to set _prev to name of first application process whose frontmost is true' \
-    -e "tell application \"Terminal\" to do script \"tmux attach -t $session\"" \
-    -e 'delay 0.3' -e 'try' -e 'tell application _prev to activate' -e 'end try' >/dev/null 2>&1 || true
+  local attach_cmd="${_SHARED_ROOT}/loop/attach-${session}.command"
+  printf '#!/bin/bash\nexec tmux attach -t %s\n' "$session" > "$attach_cmd" 2>/dev/null || return 0
+  chmod +x "$attach_cmd" 2>/dev/null || return 0
+  open -g -a Terminal "$attach_cmd" >/dev/null 2>&1 || true
 }
 
 # Dispatch a peer CLI command inside an existing tmux session (window 0).
@@ -2976,10 +3100,13 @@ _agent_argv() {
         interactive) _AGENT_ARGV=(opencode "$prompt") ;;
         *)           _AGENT_ARGV=(opencode run "$prompt") ;;
       esac ;;
-    gemini)
-      # gemini integration is interactive-only for now (used by onboard flow).
+    agy)
+      # Antigravity (agy) replaces the deprecated Google Gemini CLI as of
+      # late 2025. agy reuses ~/.gemini/ for config and reads GEMINI.md
+      # natively, so the convention sync target is unchanged — only the
+      # invoked binary changes. Interactive-only (used by onboard flow).
       case "$mode" in
-        interactive) _AGENT_ARGV=(gemini "$prompt") ;;
+        interactive) _AGENT_ARGV=(agy -i "$prompt") ;;
         *) return 1 ;;
       esac ;;
     *) return 1 ;;
@@ -3072,7 +3199,7 @@ _slides_lib() {
 # Returns 0 + prints the path if the template exists, else returns 1.
 _slides_template_path() {
   local name="$1"
-  local tpl="${ROLL_PKG_DIR}/site/slides/templates/${name}.html"
+  local tpl="${ROLL_PKG_DIR}/lib/slides/templates/${name}.html"
   if [[ -f "$tpl" ]]; then
     printf '%s' "$tpl"
     return 0
@@ -3702,8 +3829,12 @@ _slug_migrate_from_legacy() {
     [[ "$(uname -s 2>/dev/null)" == "Darwin" ]] || return 0
     # Compute the pre-FIX-056 slug: same algorithm but without realpath.
     local raw_path; raw_path=$(pwd 2>/dev/null)
+    # FIX-094: `_common=$(...)` as a standalone assignment statement inherits the
+    # command's exit code; `set -e` aborts the whole script when cwd is non-git
+    # (git rev-parse exits 128). `|| true` keeps probing semantics — we WANT to
+    # detect "no git" by empty output, not by killing the script.
     local _common
-    _common=$(git -C "$raw_path" rev-parse --git-common-dir 2>/dev/null)
+    _common=$(git -C "$raw_path" rev-parse --git-common-dir 2>/dev/null) || true
     if [[ -n "$_common" && "$_common" == *"/.git" ]]; then
       raw_path="${_common%/.git}"
     fi
@@ -4195,14 +4326,26 @@ _inner_cleanup() {
      && [ -n "\${CYCLE_ID:-}" ]; then
     _unpushed=\$(cd "\$WT" && git rev-list --count "origin/main..HEAD" 2>/dev/null || echo 0)
     if [ "\${_unpushed:-0}" -gt 0 ]; then
-      _orphan_tag="loop-orphan-\${CYCLE_ID}"
-      if ( cd "\$WT" && git push origin "\$BRANCH" 2>/dev/null \\
-           && git tag "\$_orphan_tag" 2>/dev/null \\
-           && git push origin "\$_orphan_tag" 2>/dev/null ); then
-        _loop_event cycle_end "\${CYCLE_ID}" "\${BRANCH:-}" "orphan" 2>/dev/null || true
+      # FIX-091: prefer a real PR so auto-merge lands the work; tag-only is the
+      # last-resort because it requires manual cherry-pick. Emit cycle_end "done"
+      # (canonical success status the dashboard recognizes) when PR publishes.
+      _slug=""
+      if _gh_resolve _slug \\
+         && ( cd "\$WT" && _loop_publish_pr "\$BRANCH" "loop cycle \${CYCLE_ID}" ) >/dev/null 2>&1; then
+        _loop_event cycle_end "\${CYCLE_ID}" "\${BRANCH:-}" "done" 2>/dev/null || true
         _CYCLE_END_WRITTEN=1
-        _runs_append "orphan" 0 "[]" 2>/dev/null || true
-        _worktree_alert "cycle \${CYCLE_ID}: aborted with \${_unpushed} commits; FIX-086 pushed orphan tag \${_orphan_tag}" 2>/dev/null || true
+        _runs_append "done" 0 "[]" 2>/dev/null || true
+        _worktree_alert "cycle \${CYCLE_ID}: aborted with \${_unpushed} commits; FIX-091 published as PR" 2>/dev/null || true
+      else
+        _orphan_tag="loop-orphan-\${CYCLE_ID}"
+        if ( cd "\$WT" && git push origin "\$BRANCH" 2>/dev/null \\
+             && git tag "\$_orphan_tag" 2>/dev/null \\
+             && git push origin "\$_orphan_tag" 2>/dev/null ); then
+          _loop_event cycle_end "\${CYCLE_ID}" "\${BRANCH:-}" "orphan" 2>/dev/null || true
+          _CYCLE_END_WRITTEN=1
+          _runs_append "orphan" 0 "[]" 2>/dev/null || true
+          _worktree_alert "cycle \${CYCLE_ID}: aborted with \${_unpushed} commits; FIX-086 pushed orphan tag \${_orphan_tag}" 2>/dev/null || true
+        fi
       fi
     fi
   fi
@@ -4588,13 +4731,16 @@ if command -v tmux >/dev/null 2>&1; then
   # to the tmux session so the user can watch the loop work in real time.
   # FIX-054: terminal selection removed — fixed to macOS Terminal.app for
   # predictability (per-user detection silently failed on Ghostty upgrades).
-  # Best-effort focus retention: capture the current frontmost app and
-  # re-activate after.
-  if [ -z "\${ROLL_LOOP_NO_POPUP:-}" ] && [ -z "\${BATS_TEST_NUMBER:-}" ] && [ ! -f "\$HOME/.shared/roll/loop/mute-${slug}" ] && [ "\$(uname)" = "Darwin" ] && command -v osascript >/dev/null 2>&1; then
-    osascript \\
-      -e 'tell application "System Events" to set _prev to name of first application process whose frontmost is true' \\
-      -e "tell application \"Terminal\" to do script \"tmux attach -t \$SESSION\"" \\
-      -e 'delay 0.3' -e 'try' -e 'tell application _prev to activate' -e 'end try' >/dev/null 2>&1 || true
+  # Uses \`open -g\` so the window appears in the background and does not steal
+  # focus. Replaces a prior osascript capture-frontmost / restore-focus dance
+  # that triggered LaunchServices "where is <app>" prompts when the active
+  # process name differed from its .app bundle name (e.g. MSTeams vs
+  # Microsoft Teams.app).
+  if [ -z "\${ROLL_LOOP_NO_POPUP:-}" ] && [ -z "\${BATS_TEST_NUMBER:-}" ] && [ ! -f "\$HOME/.shared/roll/loop/mute-${slug}" ] && [ "\$(uname)" = "Darwin" ]; then
+    _attach_cmd="\$HOME/.shared/roll/loop/attach-\$SESSION.command"
+    printf '#!/bin/bash\\nexec tmux attach -t %s\\n' "\$SESSION" > "\$_attach_cmd" 2>/dev/null || true
+    chmod +x "\$_attach_cmd" 2>/dev/null || true
+    open -g -a Terminal "\$_attach_cmd" >/dev/null 2>&1 || true
   fi
   _OUTER_TIMEOUT=\$(( \${ROLL_LOOP_CYCLE_TIMEOUT_SEC:-2700} + 300 ))
   _outer_wait_start=\$(date +%s)
@@ -4687,21 +4833,43 @@ _install_launchd_plists() {
     local after; after=$(cat "$plist")
     if [[ "$before" != "$after" ]]; then
       updated=$((updated + 1))
-      if _launchd_is_loaded "$label"; then
-        # FIX-027: use bootout/bootstrap so we don't disturb the label's
-        # enabled flag in the launchd overrides db (which legacy
-        # unload/load no-`-w` wipes on macOS Sonoma+, causing
-        # `roll loop status` to falsely report off after `roll update`).
-        local uid; uid=$(id -u)
-        launchctl bootout "gui/${uid}/${label}" 2>/dev/null || true
-        launchctl bootstrap "gui/${uid}" "$plist" 2>/dev/null || true
-      elif [[ -z "$before" ]]; then
-        # FIX-059: brand-new plist — macOS FSEvents auto-bootstraps any new
-        # file dropped in ~/Library/LaunchAgents/, so projects never enabled
-        # via 'roll loop on' would fire every hour. Immediately mark disabled
-        # in the overrides db to block that auto-load.
-        local uid; uid=$(id -u)
-        launchctl disable "gui/${uid}/${label}" 2>/dev/null || true
+      # FIX-090: gate launchctl writes so a sandboxed plist never gets
+      # registered into the user's REAL gui/<uid> domain. Without this,
+      # `launchctl bootstrap gui/<uid> <sandbox-plist>` outlives TEST_TMP
+      # cleanup as a zombie that either fails silently (EX_CONFIG) or, when
+      # the label collides with the dev's project slug, displaces the real
+      # registration and kills the autonomous loop. Two gate paths:
+      #   - explicit: integration_setup exports _LAUNCHD_SKIP_REGISTRY=1
+      #   - implicit: if _LAUNCHD_DIR was auto-sandboxed under _SHARED_ROOT
+      #     (FIX-087 inner-runner.sh re-source path) we infer skip — callers
+      #     that genuinely want the launchctl flow override _LAUNCHD_DIR to
+      #     a path outside _SHARED_ROOT (unit tests; production has no
+      #     _SHARED_ROOT match against ~/Library/LaunchAgents).
+      # See helpers.bash and tests/unit/launchd_sandbox.bats.
+      local _skip_reg="${_LAUNCHD_SKIP_REGISTRY:-}"
+      if [[ -z "$_skip_reg" ]]; then
+        case "${_LAUNCHD_DIR:-}/" in
+          "${_SHARED_ROOT:-/nonexistent}"/*) _skip_reg=1 ;;
+          *) _skip_reg=0 ;;
+        esac
+      fi
+      if [[ "$_skip_reg" != "1" ]]; then
+        if _launchd_is_loaded "$label"; then
+          # FIX-027: use bootout/bootstrap so we don't disturb the label's
+          # enabled flag in the launchd overrides db (which legacy
+          # unload/load no-`-w` wipes on macOS Sonoma+, causing
+          # `roll loop status` to falsely report off after `roll update`).
+          local uid; uid=$(id -u)
+          launchctl bootout "gui/${uid}/${label}" 2>/dev/null || true
+          launchctl bootstrap "gui/${uid}" "$plist" 2>/dev/null || true
+        elif [[ -z "$before" ]]; then
+          # FIX-059: brand-new plist — macOS FSEvents auto-bootstraps any new
+          # file dropped in ~/Library/LaunchAgents/, so projects never enabled
+          # via 'roll loop on' would fire every hour. Immediately mark disabled
+          # in the overrides db to block that auto-load.
+          local uid; uid=$(id -u)
+          launchctl disable "gui/${uid}/${label}" 2>/dev/null || true
+        fi
       fi
     fi
   done

package/conventions/config.yaml

@@ -7,7 +7,7 @@
 sync_claude: ~/.claude/CLAUDE.md
 sync_kimi: ~/.kimi/AGENTS.md
 sync_codex: ~/.codex/AGENTS.md
-sync_gemini: ~/.gemini/GEMINI.md
+sync_agy: ~/.gemini/GEMINI.md   # Antigravity (agy) reuses the legacy ~/.gemini/ path
 
 # User preferences
 default_language: zh

package/conventions/global/AGENTS.md

@@ -133,7 +133,7 @@ conventions, deploy targets.
 |---|---|---|
 | `conventions/global/AGENTS.md` | `conventions/templates/<type>/AGENTS.md` | All agents |
 | `conventions/global/CLAUDE.md` | `conventions/templates/<type>/CLAUDE.md` | Claude Code |
-| `conventions/global/GEMINI.md` | `conventions/templates/<type>/GEMINI.md` | Gemini CLI |
+| `conventions/global/GEMINI.md` | `conventions/templates/<type>/GEMINI.md` | Antigravity (agy) — reads `~/.gemini/GEMINI.md` natively |
 | `conventions/global/project_rules.md` | `conventions/templates/<type>/project_rules.md` | Trae IDE |
 
 The CLAUDE / GEMINI / project_rules global files themselves declare they

package/conventions/global/GEMINI.md

@@ -1,9 +1,14 @@
-# Global Preferences — Gemini CLI
+# Global Preferences — Antigravity (agy)
 
 > Extends AGENTS.md in this directory — read that first for shared conventions.
-> This file adds Gemini CLI-specific configuration only.
+> This file adds Antigravity-specific configuration only.
+>
+> File is named `GEMINI.md` because agy reads `~/.gemini/GEMINI.md` natively
+> (it reuses the legacy Gemini CLI config dir). The filename is the canonical
+> agy-side filename; the content here is for agy.
 
-## Gemini-Specific
+## Antigravity-Specific
 
 - When running shell commands, prefer the most specific tool available.
 - When a project has Roll workflow, follow the AGENTS.md conventions and use Roll skills.
+- Invoke interactively with `agy -i "<prompt>"`; non-interactive with `agy -p "<prompt>"`.

package/conventions/templates/backend-service/GEMINI.md

@@ -1,6 +1,6 @@
-# Project Preferences — Backend Service (Gemini CLI)
+# Project Preferences — Backend Service (Antigravity)
 
-> Extends global GEMINI.md + project AGENTS.md.
+> Extends global GEMINI.md (Antigravity) + project AGENTS.md.
 
 ## Stack
 
@@ -8,7 +8,7 @@
 - Database: Prisma or Drizzle ORM
 - Testing: Vitest + Supertest
 
-## Gemini Notes
+## Antigravity (agy) Notes
 
 - No frontend in this project. API-only service.
 - Write integration tests that hit real endpoints, not mocked handlers.

package/conventions/templates/cli/GEMINI.md

@@ -1,6 +1,6 @@
-# Project Preferences — CLI Tool (Gemini CLI)
+# Project Preferences — CLI Tool (Antigravity)
 
-> Extends global GEMINI.md + project AGENTS.md.
+> Extends global GEMINI.md (Antigravity) + project AGENTS.md.
 
 ## Stack
 
@@ -8,7 +8,7 @@
 - CLI framework: commander or citty
 - Testing: Vitest
 
-## Gemini Notes
+## Antigravity (agy) Notes
 
 - No server, no frontend. CLI tool only.
 - Test commands by running them, not just unit tests.

package/conventions/templates/frontend-only/GEMINI.md

@@ -1,13 +1,13 @@
-# Project Preferences — Frontend Only (Gemini CLI)
+# Project Preferences — Frontend Only (Antigravity)
 
-> Extends global GEMINI.md + project AGENTS.md.
+> Extends global GEMINI.md (Antigravity) + project AGENTS.md.
 
 ## Stack
 
 - React + shadcn/ui + Tailwind CSS + Vite
 - Testing: Vitest + Playwright
 
-## Gemini Notes
+## Antigravity (agy) Notes
 
 - No backend in this project. All data via external API consumption.
 - Run `npm run build` to verify production bundle compiles before pushing.

package/conventions/templates/fullstack/GEMINI.md

@@ -1,6 +1,6 @@
-# Project Preferences — Fullstack Web (Gemini CLI)
+# Project Preferences — Fullstack Web (Antigravity)
 
-> Extends global GEMINI.md + project AGENTS.md.
+> Extends global GEMINI.md (Antigravity) + project AGENTS.md.
 
 ## Stack
 
@@ -8,7 +8,7 @@
 - Backend: Node.js API (Express/Hono/Fastify)
 - Testing: Vitest (unit) + Playwright (E2E)
 
-## Gemini Notes
+## Antigravity (agy) Notes
 
 - When modifying API contracts, update both `api/types.ts` and `src/shared/types/` in the same commit.
 - Run `npm run build` to verify both frontend and backend compile before pushing.

package/lib/model_prices.py

@@ -12,15 +12,26 @@ to sonnet rates with a stderr warning so dashboards don't blank out.
 import sys
 from typing import Dict, Optional
 
-# Rates per million tokens (USD).
+# Rates per million tokens (USD). cache_create = 5-minute cache write (1.25x
+# input). 1-hour cache writes (2x input) are not modeled — Roll loop uses the
+# default 5m caching only.
+# Source: https://platform.claude.com/docs/en/about-claude/pricing
 PRICES: Dict[str, Dict[str, float]] = {
-    # Claude 4.x family (current as of 2026-05).
-    "claude-opus-4-7":    {"in": 15.00, "out": 75.00, "cache_create": 18.75, "cache_read": 1.50},
-    "claude-opus-4-6":    {"in": 15.00, "out": 75.00, "cache_create": 18.75, "cache_read": 1.50},
+    # Claude 4.x Opus family — 2026-05 repricing: Opus 4.5+ moved to
+    # $5/$25 base, 3x cheaper than Opus 4 / 4.1.
+    "claude-opus-4-7":    {"in":  5.00, "out": 25.00, "cache_create":  6.25, "cache_read": 0.50},
+    "claude-opus-4-6":    {"in":  5.00, "out": 25.00, "cache_create":  6.25, "cache_read": 0.50},
+    "claude-opus-4-5":    {"in":  5.00, "out": 25.00, "cache_create":  6.25, "cache_read": 0.50},
+    "claude-opus-4-1":    {"in": 15.00, "out": 75.00, "cache_create": 18.75, "cache_read": 1.50},
+    "claude-opus-4":      {"in": 15.00, "out": 75.00, "cache_create": 18.75, "cache_read": 1.50},
+    # Claude 4.x Sonnet family.
     "claude-sonnet-4-6":  {"in":  3.00, "out": 15.00, "cache_create":  3.75, "cache_read": 0.30},
+    "claude-sonnet-4-5":  {"in":  3.00, "out": 15.00, "cache_create":  3.75, "cache_read": 0.30},
     "claude-sonnet-4":    {"in":  3.00, "out": 15.00, "cache_create":  3.75, "cache_read": 0.30},
+    # Claude 4.x Haiku family.
     "claude-haiku-4-5":   {"in":  1.00, "out":  5.00, "cache_create":  1.25, "cache_read": 0.10},
-    # Older fallbacks
+    # Older / retired models (Bedrock & Vertex only for 3.5 Haiku).
+    "claude-haiku-3-5":   {"in":  0.80, "out":  4.00, "cache_create":  1.00, "cache_read": 0.08},
     "claude-3-5-sonnet":  {"in":  3.00, "out": 15.00, "cache_create":  3.75, "cache_read": 0.30},
 }