feat: smart countdowns, model+context merge, auto extra gating

Countdown display now responds to two signals: percentage pressure
(5h >= 80%, 7d >= 70%) and time proximity (5h reset <= 2h, 7d reset
<= 3d). Either signal triggers the countdown independently.

Recovery color (DIM_GREEN) when usage is high but reset is imminent
-- reduces false urgency for users about to get a fresh window.

Context bar merged into model component: opus4.6[1m][15%] instead
of opus4.6[1m] [15%]. Context is a property of the model session.

Extra display default changed from "always" to "auto" -- shows when
quota runs out (5h >= 80%, 7d >= 70%) or extra utilization >= 50%.
Hidden during calm sessions.

Switched 5h from clock time (@14:30) to relative time (~1h30m) for
consistency with 7d. Removed dead format_reset_clock(). Extracted
all thresholds as named constants.

95 bats tests, all passing.

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

Author: lroolle

CHANGELOG.md

@@ -1,6 +1,61 @@
 # Changelog
 
-## Unreleased
+## v0.6.0 — 2026-05-26 — Smart Countdowns & Information Grouping
+
+Tested against Claude Code CLI v2.1.143 (MAX and PRO accounts).
+
+### Smart Countdown Display
+
+Reset countdowns now respond to two independent signals:
+
+- **Percentage pressure**: 5h >= 80% or 7d >= 70% (existing behavior)
+- **Time proximity**: 5h reset <= 2h or 7d reset <= 3d (new)
+
+Either signal triggers the countdown. A user at 40% with 90 minutes to reset
+sees `5h[40%~1h30m]` — the opportunity signal: "burn freely, fresh window
+coming." Switched 5h from wall-clock (`@14:30`) to relative time (`~1h30m`)
+for consistency with 7d.
+
+**Recovery color**: DIM_GREEN when usage is high but reset is imminent
+(5h: <= 30min, 7d: <= 12h). Communicates "it was hot, it's cooling down."
+
+### Model + Context Merge
+
+Context bar now attaches directly to the model: `opus4.6[1m][█░░░░░15%]`
+instead of `opus4.6[1m] [█░░░░░15%]`. Context is a property of the model
+session, not an independent stat.
+
+### Extra Usage: Auto Mode
+
+New default `--extra auto` replaces `always`. Shows the extra-usage section
+only when actionable:
+
+- 5h >= 80% or 7d >= 70% (quota running out)
+- Extra utilization >= 50% (budget pressure)
+
+Hides extra during calm sessions. `always`, `on-limit`, `off` still available.
+
+### Thresholds as Named Constants
+
+All auto-display thresholds extracted to top-level variables:
+
+```
+FIVE_HOUR_COUNTDOWN_SECS=7200    # 2h
+FIVE_HOUR_RECOVERY_SECS=1800     # 30min
+SEVEN_DAY_COUNTDOWN_SECS=259200  # 3d
+SEVEN_DAY_RECOVERY_SECS=43200    # 12h
+EXTRA_AUTO_UTIL_PCT=50           # 50%
+```
+
+### Cleanup
+
+- Removed dead `format_reset_clock()` (replaced by relative time)
+- Removed `context` from all theme `stat_order` strings (now part of model)
+- 95 bats tests (was 81)
+
+---
+
+## v0.5.0 — 2026-05-25 — Stdin-First Architecture & Extra Usage
 
 Tested against Claude Code CLI v2.1.141 (MAX and PRO accounts).
 
@@ -34,7 +89,7 @@ directly from the CLI's JSON input instead of computing independently.
 
 New `--extra` flag controls when the extra-usage component appears:
 
-- `always` (default) — show whenever extra usage is enabled
+- `always` — show whenever extra usage is enabled
 - `on-limit` — show only when 5h >= 80% or 7d >= 70% (quota under pressure)
 - `off` — never show
 
@@ -47,8 +102,6 @@ The `developer` theme defaults to `on-limit`; `minimal` defaults to `off`.
   flight, `!` when the last fetch failed and data may be stale. Extra usage
   has its own independent indicator (separate API call).
 - Duration shows hours for long sessions: `1h30m` instead of `90m`.
-- Added space between model suffix and context bar to prevent visual confusion:
-  `opus4.6[1m] [█░░░░░26%]` instead of `opus4.6[1m][█░░░░░26%]`.
 - Removed dead `add_component_no_space` and `format_usage_bar` functions.
 - Fixed `format_duration(0)` returning "1m" instead of "0m".
 - Fixed color variables used before definition (git info, path had no color).
@@ -61,11 +114,6 @@ The `developer` theme defaults to `on-limit`; `minimal` defaults to `off`.
 - Time: plain dim instead of dim cyan — less color noise.
 - User tier label gets color: MAX=green, PRO=cyan, ENT/TEAM=dim cyan.
 
-### Documentation
-
-- Documented the extra-usage component, API behavior, and updated README preview
-  signals.
-
 ---
 
 ## v0.3.0 — 2026-05-12 — Quota Reset Time & API Cleanup

README.md

@@ -66,9 +66,9 @@ Then add to `~/.claude/settings.json`:
 ## What It Shows
 
 ```text
-project (main*)  +84/-14 1h30m $6.72 opus4.6[1m] [███░░░26%] [MAX|feast.t.] 5h[24%] 7d[100%~12h6m] ex[$16.29/$200 8% bal$4.66]
-   |       |       |      |     |       |           |            |           |          |                |
- path   branch   edits   time  cost   model       context       user      5h quota   7d quota       extra usage
+project (main*)  +84/-14 1h30m $6.72 opus4.6[1m][███░░░26%] [MAX|feast.t.] 5h[24%] 7d[100%~12h6m] ex[$16.29/$200 8% bal$4.66]
+   |       |       |      |     |       |                        |           |          |                |
+ path   branch   edits   time  cost   model+context             user      5h quota   7d quota       extra usage
 ```
 
 Every component earns its place:
@@ -79,10 +79,10 @@ Every component earns its place:
 | Activity | Session diff without opening git. |
 | Time and cost | Track long sessions. Hours format above 60m (`1h30m`). |
 | Model | Abbreviated. `claude-opus-4-6[1m]` becomes `opus4.6[1m]`. |
-| Context bar | Green / yellow / red by pressure. Matches `/context` formula. |
+| Context bar | Merged with model. Green / yellow / red by pressure. |
 | User tier | MAX is green, PRO is cyan. Truncated display name. |
-| Quota | Integer percentages. Reset countdown when 5h >= 80% or 7d >= 70%. |
-| Extra usage | Monthly spend, limit, prepaid balance. `--extra on-limit` to auto-hide. |
+| Quota | Integer percentages. Countdown on pressure (>= 80%/70%) or time proximity (<= 2h/3d). Recovery color when high usage + imminent reset. |
+| Extra usage | Monthly spend, limit, prepaid balance. `--extra auto` shows when quota runs out. |
 
 ## vs Built-in `/statusline`
 
@@ -98,7 +98,7 @@ Every component earns its place:
 | Tier display + model abbreviation | -- | Yes |
 | 5 themes, 9 bar styles | -- | Yes |
 | OAuth + macOS Keychain | -- | Yes |
-| 85 bats tests + CI | -- | Yes |
+| 95 bats tests + CI | -- | Yes |
 
 ## Configuration
 
@@ -112,10 +112,10 @@ Flags go in the command string in `~/.claude/settings.json`:
 |------|--------|---------|
 | `--theme` | `minimal`, `compact`, `detailed`, `developer`, `manager` | (none) |
 | `--style` | `unicode-blocks`, `single-block`, `bracketed-bars`, `filled-dots`, `square-blocks`, `line-segments`, `ascii-bars`, `percent-only`, `fraction-display` | `unicode-blocks` |
-| `--order` | Comma-separated: `activity,time,cost,model,context,user,quota,extra` | all |
+| `--order` | Comma-separated: `activity,time,cost,model,user,quota,extra` | all |
 | `--path-display` | `project`, `cwd`, `full`, `relative` | `project` |
 | `--alignment` | `left-right`, `right-left`, `center` | `left-right` |
-| `--extra` | `always`, `on-limit`, `off` | `always` |
+| `--extra` | `auto`, `always`, `on-limit`, `off` | `auto` |
 | `--debug` | Write logs to `/tmp/claude-code-statusline.log` | off |
 | `--test [json]` | Render with mock data | off |
 
@@ -132,14 +132,16 @@ Flags go in the command string in `~/.claude/settings.json`:
 ### Extra Usage Gating
 
 ```text
---extra always      5h[24%] 7d[10%] ex[$19.52/$200 10% bal$4.66]
---extra on-limit    5h[24%] 7d[10%]                                (quota OK, hidden)
---extra on-limit    5h[87%@14:30] 7d[10%] ex[$19.52/$200 10%]     (5h >= 80%, shown)
+--extra auto        5h[24%] 7d[10%]                                (calm, hidden)
+--extra auto        5h[87%~2h] 7d[10%] ex[$19.52/$200 10%]        (5h >= 80%, shown)
+--extra always      5h[24%] 7d[10%] ex[$19.52/$200 10% bal$4.66]  (always shown)
+--extra on-limit    5h[87%~2h] 7d[10%] ex[$19.52/$200 10%]        (same as auto minus extra_util gate)
 --extra off         5h[24%] 7d[10%]                                (always hidden)
 ```
 
-`on-limit` keeps the statusline compact until quota pressure makes extra-usage
-budget actionable.
+`auto` (default) shows extra when quota runs out (5h >= 80%, 7d >= 70%) or
+extra budget is pressured (utilization >= 50%). Compact by default, actionable
+when it matters.
 
 ### Quota Polling