feat: v0.15.1 — scoped quota badge moves next to the model

fb[67%] renders right after the model+context block instead of at the
tail of the 5h/7d cluster. The scoped quota is a property of the model
the session is running — the eye looks for it where the model is. It is
still a weekly number (same reset as the 7d badge), scoped to one model.

Extracted into build_scoped_quota_display; build_usage_display keeps
only the legacy-field suppression check.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: lroolle

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## v0.15.1 — 2026-07-05 — scoped quota badge moves next to the model
+
+`fb[67%]` now renders right after the model+context block instead of at the
+tail of the 5h/7d cluster:
+
+```
+260128_ccreverse-up +131/-16 $10.53 fabl5[1m][█░░░░░12%] fb[67%] [MAX|you] 5h[95%@23:00] 7d[55%]
+```
+
+The scoped quota is a property of the model the session is running — the eye
+looks for it where the model is, not in the account-wide quota cluster. It is
+still a weekly number (same reset as the 7d badge), just scoped to one model.
+
+- Extracted into `build_scoped_quota_display`; `build_usage_display` keeps
+  only the legacy-field suppression check.
+- Test count: 249.
+
 ## v0.15.0 — 2026-07-05 — model-scoped weekly quota (`fb[65%]`)
 
 The usage API moved per-model weekly limits out of dedicated fields

README.md

@@ -82,7 +82,7 @@ Every component earns its place:
 | Effort | Compact lowercase badge: `lo` / `md` / `xh` / `max` / `ultra` / `auto` (`high` is the default and stays hidden). Dim for routine levels; `max` / `ultra` use the pressure color; `fast` shows in fast mode. |
 | Context bar | Merged with model. Green / yellow / red by window pressure. On 1M models the bar also carries the premium input-pricing band: yellow past 200k tokens, red past 800k — the % alone looks calm (320k = 32%) while every request bills at the premium rate. A real 0% (e.g. right after `/compact` resets the window) renders a visibly empty bar `[░░░░░░0%]` — the snap to empty *is* the refresh signal; the bar hides only when no context data exists at all. |
 | User tier | Neutral white-weight (MAX bold, PRO normal, dim otherwise) — identity, never a status color. Truncated display name. |
-| Quota | Integer percentages. The 5h badge always carries its reset time while a window is live — `5h[42%@14:30]` reads "42% used, resets at 14:30" — because on a 5h horizon the reset is the number you plan the current sitting around. Wall-clock, not a countdown, on purpose: Claude Code only re-renders the statusline on activity, so a relative "@1h38m" silently decays into a lie during idle gaps, while "@14:30" stays true in a frozen frame. (The 7d badge stays relative — `@5d` decays at day granularity, slower than any idle gap.) When a window's utilization climbs between renders, a reverse-video `+N` token appears right after the badge for ~60s: `5h[44%@14:32]+2` means "you just burned 2%". A drop (window reset) stays quiet — the fresh low number is its own signal. **7d is forecast, not leveled**: a learned per-weekday burn profile (EWMA over your own usage history) plus your recent 24h burn project whether the quota outlasts the window — your heavy Tuesday counts more than a generic average. The verdict is color alone; under pressure the badge shows explicit time remaining in the window: `7d[44%@5d]` red means "at your pace, dry days before the reset 5 days from now". Cold start (<14 days history) falls back to window-average pacing. Recovery color when reset is imminent. **Model-scoped weekly quota**: when the usage API carries a per-model weekly limit (`limits[]`, `kind=weekly_scoped`) for the model your session is running, it gets its own badge — `fb[65%]` on a Fable 5 session, `op[33%]` on Opus. Other models' scoped quotas stay hidden: only the limit constraining *this* session is signal. Supersedes the legacy `seven_day_opus`/`seven_day_sonnet` fields, which the API now sends as null. |
+| Quota | Integer percentages. The 5h badge always carries its reset time while a window is live — `5h[42%@14:30]` reads "42% used, resets at 14:30" — because on a 5h horizon the reset is the number you plan the current sitting around. Wall-clock, not a countdown, on purpose: Claude Code only re-renders the statusline on activity, so a relative "@1h38m" silently decays into a lie during idle gaps, while "@14:30" stays true in a frozen frame. (The 7d badge stays relative — `@5d` decays at day granularity, slower than any idle gap.) When a window's utilization climbs between renders, a reverse-video `+N` token appears right after the badge for ~60s: `5h[44%@14:32]+2` means "you just burned 2%". A drop (window reset) stays quiet — the fresh low number is its own signal. **7d is forecast, not leveled**: a learned per-weekday burn profile (EWMA over your own usage history) plus your recent 24h burn project whether the quota outlasts the window — your heavy Tuesday counts more than a generic average. The verdict is color alone; under pressure the badge shows explicit time remaining in the window: `7d[44%@5d]` red means "at your pace, dry days before the reset 5 days from now". Cold start (<14 days history) falls back to window-average pacing. Recovery color when reset is imminent. **Model-scoped weekly quota**: when the usage API carries a per-model weekly limit (`limits[]`, `kind=weekly_scoped`) for the model your session is running, it renders right after the model+context block — `fabl5[1m][12%] fb[67%]` on a Fable 5 session, `op[33%]` on Opus — because the quota is a property of the model you're running, not of the account-wide 5h/7d cluster. It's a weekly number (same reset as the 7d badge), scoped to one model. Other models' scoped quotas stay hidden: only the limit constraining *this* session is signal. Supersedes the legacy `seven_day_opus`/`seven_day_sonnet` fields, which the API now sends as null. |
 | Extra usage | Monthly spend, limit, prepaid balance. `--extra auto` shows when quota runs out. |
 | Cache health | Detects observed prompt-cache rebuilds and cache-read drops. `cache!` on break, `cache~` when building. If a future Claude Code stdin includes TTL breakdown, `--cache always` can show `cache:1h@14:20`; current stdin usually exposes aggregate cache tokens only. Hidden when healthy by default. |
 
@@ -109,7 +109,7 @@ red, matching its Claude Code TUI color) = model family; everything else is
 | OAuth + macOS Keychain | -- | Yes |
 | Quota bump flash (+N) | -- | Yes |
 | Model-scoped weekly quota (`fb`/`op`/`sn`) | -- | Yes |
-| 248 bats tests + CI | -- | Yes |
+| 249 bats tests + CI | -- | Yes |
 
 ## Configuration
 
@@ -282,7 +282,7 @@ run. Setting only `CLAUDE_CACHE_DIR` keeps the legacy single-dir behavior.
 npm exec --yes bats -- t/
 ```
 
-248 tests across `t/statusline.bats` (236 statusline + integration) and
+249 tests across `t/statusline.bats` (237 statusline + integration) and
 `t/install.bats` (12 installer). CI runs on push and PR to `main`.
 
 ## Project Structure

statusline.sh

@@ -1706,11 +1706,47 @@ model_scope_abbrev() {
     esac
 }
 
+# Model-scoped weekly quota badge (limits[] kind=weekly_scoped, the contract
+# that replaced seven_day_opus/sonnet). Renders only the scope matching the
+# model THIS session is burning — other models' quotas are noise. Substring
+# match, so scope "Fable" hits claude-fable-5. It's a WEEKLY number (shares
+# its reset with the 7d badge) but displays next to the model+context block,
+# not in the 5h/7d cluster: the quota is a property of the model you're
+# running, and that's where the eye looks for it.
+build_scoped_quota_display() {
+    local usage_data="$1"
+    local current_model="$2"
+    [ -n "$usage_data" ] || return 0
+    [ -n "$current_model" ] || return 0
+
+    local scoped_tsv
+    scoped_tsv=$(echo "$usage_data" | jq -r '
+        .limits[]? | select(.kind == "weekly_scoped" and (.scope.model.display_name // "") != "")
+        | [(.scope.model.display_name | ascii_downcase), (.percent // 0)] | @tsv' 2>/dev/null)
+    [ -n "$scoped_tsv" ] || return 0
+
+    local model_lc
+    model_lc=$(printf '%s' "$current_model" | tr '[:upper:]' '[:lower:]')
+    local scope_name scope_pct
+    while IFS=$'\t' read -r scope_name scope_pct; do
+        [ -n "$scope_name" ] || continue
+        case "$model_lc" in
+        *"$scope_name"*)
+            local scope_int=$(printf '%.0f' "$scope_pct" 2>/dev/null || echo 0)
+            if [ "$scope_int" -gt 0 ] 2>/dev/null; then
+                local color=$(get_seven_day_color "$scope_int")
+                printf '%s' "${DIM}$(model_scope_abbrev "$scope_name")${color}[${scope_int}%]${RESET}"
+                return 0
+            fi
+            ;;
+        esac
+    done <<<"$scoped_tsv"
+}
+
 build_usage_display() {
     local usage_data="$1"
     local user_tier="${2:-}"  # MAX, PRO, ENT, TEAM, or empty
     local bump_state_file="${3:-}"  # optional: enables the +N bump flash
-    local current_model="${4:-}"  # model id/name of this session; gates scoped badges
 
     if [ -z "$usage_data" ]; then
         echo ""
@@ -1838,38 +1874,14 @@ build_usage_display() {
         parts+=("${DIM}7d${color}[${seven_int}%${reset_suffix}]${bump_part}${RESET}")
     fi
 
-    # Model-scoped weekly quotas (limits[] kind=weekly_scoped, the contract
-    # that replaced seven_day_opus/sonnet — those now arrive null). Only the
-    # scope matching the model THIS session is burning renders: that is the
-    # number constraining you right now; other models' quotas are noise.
-    # Match is a substring test so scope "Fable" hits claude-fable-5.
-    local has_scoped=false
-    local scoped_tsv
-    scoped_tsv=$(echo "$usage_data" | jq -r '
-        .limits[]? | select(.kind == "weekly_scoped" and (.scope.model.display_name // "") != "")
-        | [(.scope.model.display_name | ascii_downcase), (.percent // 0)] | @tsv' 2>/dev/null)
-    if [ -n "$scoped_tsv" ]; then
-        has_scoped=true
-        local model_lc
-        model_lc=$(printf '%s' "$current_model" | tr '[:upper:]' '[:lower:]')
-        local scope_name scope_pct
-        while IFS=$'\t' read -r scope_name scope_pct; do
-            [ -n "$scope_name" ] || continue
-            case "$model_lc" in
-            *"$scope_name"*)
-                local scope_int=$(printf '%.0f' "$scope_pct" 2>/dev/null || echo 0)
-                if [ "$scope_int" -gt 0 ] 2>/dev/null; then
-                    local color=$(get_seven_day_color "$scope_int")
-                    parts+=("${DIM}$(model_scope_abbrev "$scope_name")${color}[${scope_int}%]${RESET}")
-                fi
-                ;;
-            esac
-        done <<<"$scoped_tsv"
-    fi
-
-    # Legacy model-specific 7d quotas (pre-limits[] responses only)
+    # Legacy model-specific 7d quotas (pre-limits[] responses only). When the
+    # response carries weekly_scoped limits the new contract supersedes these
+    # fields (they arrive null anyway); the scoped badge itself renders next
+    # to the model+context block via build_scoped_quota_display, not here.
     # MAX users: show opus only (per your spec: "no need to show sonnet for max users")
     # Others: show sonnet
+    local has_scoped=false
+    echo "$usage_data" | jq -e '[.limits[]? | select(.kind == "weekly_scoped")] | length > 0' >/dev/null 2>&1 && has_scoped=true
     if [ "$has_scoped" = false ]; then
         if [ "$user_tier" = "MAX" ]; then
             if [ "$opus_int" -gt 0 ] 2>/dev/null; then
@@ -2497,9 +2509,14 @@ if [ -n "$session_id" ] && [ "$_may_have_oauth" = true ]; then
             [ -n "$rl_seven_pct" ] && seven_int_cache=$(printf '%.0f' "$rl_seven_pct" 2>/dev/null || echo "$seven_int_cache")
         fi
 
-        quota_display=$(build_usage_display "$usage_data" "$user_tier" "$quota_state_file" "${model_id:-$model_display}")
+        quota_display=$(build_usage_display "$usage_data" "$user_tier" "$quota_state_file")
         [ -n "$quota_display" ] && quota_component="$quota_display"
 
+        # Model-scoped weekly quota hugs the model+context block (it's a
+        # property of the model this session runs, not of the 5h/7d cluster).
+        scoped_display=$(build_scoped_quota_display "$usage_data" "${model_id:-$model_display}")
+        [ -n "$scoped_display" ] && model_component="${model_component} ${scoped_display}"
+
         if [ -n "$quota_component" ]; then
             if [ -f "$lock_file" ]; then
                 quota_component="${quota_component}${DIM}~${RESET}"
@@ -2556,7 +2573,7 @@ if [ -n "$session_id" ] && [ "$_may_have_oauth" = true ]; then
             --arg sr "${rl_seven_reset}" \
             '{five_hour:{utilization:$fp,resets_at:(if $fr == "" then null else $fr end)},
               seven_day:{utilization:$sp,resets_at:(if $sr == "" then null else $sr end)}}')
-        quota_display=$(build_usage_display "$stdin_usage" "$user_tier" "$quota_state_file" "${model_id:-$model_display}")
+        quota_display=$(build_usage_display "$stdin_usage" "$user_tier" "$quota_state_file")
         [ -n "$quota_display" ] && quota_component="$quota_display"
         five_int=$(printf '%.0f' "${rl_five_pct:-0}" 2>/dev/null || echo 0)
         seven_int_cache=$(printf '%.0f' "${rl_seven_pct:-0}" 2>/dev/null || echo 0)

t/helpers.bash

@@ -39,7 +39,7 @@ debug_log() {
 # Source individual functions by extracting them from statusline.sh.
 # This is deliberate: we test the actual production code, not copies.
 eval "$(awk '
-    /^(abbreviate_model_id|get_runtime_model|format_reset_relative|format_reset_absolute|get_reset_seconds|format_duration|should_show_extra|get_cache_health|infer_cache_ttl_class|format_cache_active_time|build_cache_indicator|get_usage_color|get_seven_day_color|seven_day_elapsed|seven_day_pace|weekend_secs_ahead|get_adaptive_ttl|reap_stale_lock|merge_stdin_rate_limits|rotate_usage_log|build_seven_day_profile|seven_day_forecast|premium_band_level|abbrev_effort|effort_color|_epoch_from_ts|_fmt_epoch|render_bar|format_money_minor|oauth_token_expired|refresh_oauth_credentials_file|is_default_1m_family|get_context_limit|is_1m_model|rotate_debug_log|build_display_path|quota_bump_notice|record_fetch_error|fetch_error_remaining|fetch_error_badge|model_scope_abbrev|build_usage_display|build_extra_usage_display|build_user_info|get_user_tier)\(\)/ { capture=1 }
+    /^(abbreviate_model_id|get_runtime_model|format_reset_relative|format_reset_absolute|get_reset_seconds|format_duration|should_show_extra|get_cache_health|infer_cache_ttl_class|format_cache_active_time|build_cache_indicator|get_usage_color|get_seven_day_color|seven_day_elapsed|seven_day_pace|weekend_secs_ahead|get_adaptive_ttl|reap_stale_lock|merge_stdin_rate_limits|rotate_usage_log|build_seven_day_profile|seven_day_forecast|premium_band_level|abbrev_effort|effort_color|_epoch_from_ts|_fmt_epoch|render_bar|format_money_minor|oauth_token_expired|refresh_oauth_credentials_file|is_default_1m_family|get_context_limit|is_1m_model|rotate_debug_log|build_display_path|quota_bump_notice|record_fetch_error|fetch_error_remaining|fetch_error_badge|model_scope_abbrev|build_scoped_quota_display|build_usage_display|build_extra_usage_display|build_user_info|get_user_tier)\(\)/ { capture=1 }
     capture { print }
     capture && /^}$/ { capture=0 }
 ' "$SCRIPT_DIR/statusline.sh")"

t/statusline.bats

@@ -230,47 +230,50 @@ setup() {
     [[ "$plain" != *"op["* ]]
 }
 
-@test "build_usage_display: scoped weekly limit shows for matching model" {
+@test "build_scoped_quota_display: scoped weekly limit shows for matching model" {
     usage='{"five_hour":{"utilization":10},"seven_day":{"utilization":5},"limits":[{"kind":"weekly_scoped","group":"weekly","percent":64,"resets_at":"2099-01-05T00:00:00Z","scope":{"model":{"id":null,"display_name":"Fable"},"surface":null},"is_active":false}]}'
-    result=$(build_usage_display "$usage" "MAX" "" "claude-fable-5")
+    result=$(build_scoped_quota_display "$usage" "claude-fable-5")
     plain=$(strip_ansi "$result")
-    [[ "$plain" == *"fb[64%]"* ]]
+    [[ "$plain" == "fb[64%]" ]]
 }
 
-@test "build_usage_display: scoped weekly limit hidden for non-matching model" {
+@test "build_scoped_quota_display: scoped weekly limit hidden for non-matching model" {
     usage='{"five_hour":{"utilization":10},"seven_day":{"utilization":5},"limits":[{"kind":"weekly_scoped","group":"weekly","percent":64,"resets_at":"2099-01-05T00:00:00Z","scope":{"model":{"id":null,"display_name":"Fable"},"surface":null},"is_active":false}]}'
-    result=$(build_usage_display "$usage" "MAX" "" "claude-opus-4-8")
-    plain=$(strip_ansi "$result")
-    [[ "$plain" != *"fb["* ]]
+    result=$(build_scoped_quota_display "$usage" "claude-opus-4-8")
+    [ -z "$result" ]
 }
 
-@test "build_usage_display: scoped limits supersede legacy per-model fields" {
+@test "build_usage_display: scoped limits suppress legacy per-model fields" {
     usage='{"five_hour":{"utilization":10},"seven_day":{"utilization":5},"seven_day_opus":{"utilization":20},"limits":[{"kind":"weekly_scoped","group":"weekly","percent":64,"resets_at":"2099-01-05T00:00:00Z","scope":{"model":{"id":null,"display_name":"Fable"},"surface":null},"is_active":false}]}'
-    result=$(build_usage_display "$usage" "MAX" "" "claude-fable-5")
+    result=$(build_usage_display "$usage" "MAX")
     plain=$(strip_ansi "$result")
-    [[ "$plain" == *"fb[64%]"* ]]
     [[ "$plain" != *"op["* ]]
 }
 
-@test "build_usage_display: scoped limit for opus renders op badge on opus session" {
+@test "build_scoped_quota_display: opus scope renders op badge on opus session" {
     usage='{"five_hour":{"utilization":10},"seven_day":{"utilization":5},"limits":[{"kind":"weekly_scoped","group":"weekly","percent":33,"resets_at":"2099-01-05T00:00:00Z","scope":{"model":{"id":null,"display_name":"Opus"},"surface":null},"is_active":false}]}'
-    result=$(build_usage_display "$usage" "MAX" "" "claude-opus-4-8")
+    result=$(build_scoped_quota_display "$usage" "claude-opus-4-8")
     plain=$(strip_ansi "$result")
-    [[ "$plain" == *"op[33%]"* ]]
+    [[ "$plain" == "op[33%]" ]]
 }
 
-@test "build_usage_display: unknown scoped model falls back to two-letter abbrev" {
+@test "build_scoped_quota_display: unknown scoped model falls back to two-letter abbrev" {
     usage='{"five_hour":{"utilization":10},"seven_day":{"utilization":5},"limits":[{"kind":"weekly_scoped","group":"weekly","percent":42,"resets_at":"2099-01-05T00:00:00Z","scope":{"model":{"id":null,"display_name":"Zephyr"},"surface":null},"is_active":false}]}'
-    result=$(build_usage_display "$usage" "MAX" "" "claude-zephyr-1")
+    result=$(build_scoped_quota_display "$usage" "claude-zephyr-1")
     plain=$(strip_ansi "$result")
-    [[ "$plain" == *"ze[42%]"* ]]
+    [[ "$plain" == "ze[42%]" ]]
 }
 
-@test "build_usage_display: zero-percent scoped limit is hidden" {
+@test "build_scoped_quota_display: zero-percent scoped limit is hidden" {
     usage='{"five_hour":{"utilization":10},"seven_day":{"utilization":5},"limits":[{"kind":"weekly_scoped","group":"weekly","percent":0,"resets_at":"2099-01-05T00:00:00Z","scope":{"model":{"id":null,"display_name":"Fable"},"surface":null},"is_active":false}]}'
-    result=$(build_usage_display "$usage" "MAX" "" "claude-fable-5")
-    plain=$(strip_ansi "$result")
-    [[ "$plain" != *"fb["* ]]
+    result=$(build_scoped_quota_display "$usage" "claude-fable-5")
+    [ -z "$result" ]
+}
+
+@test "build_scoped_quota_display: empty model or usage yields nothing" {
+    usage='{"limits":[{"kind":"weekly_scoped","percent":64,"scope":{"model":{"display_name":"Fable"}}}]}'
+    [ -z "$(build_scoped_quota_display "$usage" "")" ]
+    [ -z "$(build_scoped_quota_display "" "claude-fable-5")" ]
 }
 
 @test "build_usage_display: on-pace 7d hides runway and reset suffix" {