feat: trust JSONL cache tiers, externalize all pricing to JSON

Claude Code now correctly reports cache write tiers per model:
- Main conversation (Opus/Sonnet) → ephemeral_1h_input_tokens
- Subagent requests (any model) → ephemeral_5m_input_tokens

Remove the cacheWriteAs1h override and -cache-5m flag — trust the
JSONL data as-is. Fallback for old logs without cache_creation
sub-object defaults to 1h.

Externalize all remaining hardcoded pricing to pricing.json:
- Per-model: cache_read, cache_write_5m, cache_write_1h (and
  long_ctx variants) — with fillCacheDefaults() fallback that
  derives from input price using standard multipliers when absent
- Global: long_context_threshold (200K), web_search_cost ($0.01)

Known regression: old JSONL logs (Dec 2025 – Feb 2026) where Claude
Code reported all cache writes as ephemeral_5m will now price
Opus/Sonnet cache writes at 1.25x instead of 2x. Accepted trade-off
— affects only historical data and the old override was wrong for
Haiku subagents (overpriced at 2x instead of correct 1.25x).

Author: backstabslash

CLAUDE.md

@@ -95,9 +95,9 @@ One API call produces multiple JSONL entries sharing the same `requestId`. `inpu
 
 - **Flat package structure** — all code in `package main`, one concern per file
 - **Dedup by requestId** — streaming duplicates collapsed by keeping the last entry per `requestId` in a map
-- **Externalized pricing** — all model pricing, family prefixes, display names, and default model live in `pricing.json`. Embedded via `//go:embed`, with a remote-cached copy fetched from the repo every 24h. `initPricing()` prefers cached over embedded. Adding a new model requires only editing `pricing.json` — no code changes or binary release needed
+- **Externalized pricing** — all model pricing (input, output, cache read/write tiers, long context), global settings (long context threshold, web search cost), family prefixes, display names, and default model live in `pricing.json`. Embedded via `//go:embed`, with a remote-cached copy fetched from the repo every 24h. `initPricing()` prefers cached over embedded. Adding a new model or adjusting pricing requires only editing `pricing.json` — no code changes or binary release needed. Cache fields in JSON are optional — `fillCacheDefaults()` derives them from input price using standard multipliers (0.1x read, 1.25x write-5m, 2x write-1h) when absent
 - **Pricing resolution** — exact model ID → longest family prefix match → `defaultPricing`
-- **Cache write pricing defaults to 1h** — Claude Code JSONL logs report all cache writes as `ephemeral_5m`, but Anthropic billing matches 1-hour tier pricing (2x input). Override with `-cache-5m`. `CacheWrite5m`/`CacheWrite1h` remain separate fields (different pricing multipliers)
+- **Cache write tiers are trusted from JSONL** — Claude Code now correctly reports `ephemeral_5m_input_tokens` and `ephemeral_1h_input_tokens` per model (e.g. Haiku → 5m, Opus/Sonnet → 1h). Fallback for old logs without `cache_creation` sub-object defaults to 1h. `CacheWrite5m`/`CacheWrite1h` remain separate fields (different pricing multipliers)
 - **Shared file parsing** — `parseFile()` in parser.go is used by both `parseLogs` (directory walk) and `parseSession` (statusline single-session)
 - **Local timezone everywhere** — local midnight for cutoffs, `parsed.Local()` for date bucketing. Never use `UTC()` for user-facing date logic
 - **MCP detection is best-effort** — all MCP detection functions return nil/empty on error; statusline never fails due to missing config
@@ -107,7 +107,7 @@ One API call produces multiple JSONL entries sharing the same `requestId`. `inpu
 
 ## Don't
 
-- Don't add new model pricing by editing Go code — update `pricing.json` instead (models, families, and display_names sections)
+- Don't add or change pricing by editing Go code — update `pricing.json` instead (models, families, display_names, long_context_threshold, web_search_cost)
 - Don't use `log.Fatal` or `panic` — use `fmt.Fprintf(os.Stderr, ...)` + `os.Exit(1)`
 - Don't use UTC for day boundaries — use `time.Date(...)` with `now.Location()` for local midnight
 - Don't add JSON tags to `Bucket` — it's never directly marshalled; `printJSON` defines its own output structs

README.md

@@ -18,7 +18,6 @@ Parses JSONL logs from `~/.claude/projects/`, deduplicates streaming responses,
 - [Session Exit Hook](#session-exit-hook)
 - [Configuration](#configuration)
 - [Flags](#flags)
-- [How It Works](#how-it-works)
 - [Preserving Log History](#preserving-log-history)
 
 ## Installation
@@ -58,7 +57,6 @@ goccc -projects                    # Project breakdown only
 goccc -project webapp -daily       # Filter by project name (substring match)
 goccc -days 1                      # Today's usage
 goccc -projects -top 5             # Top 5 most expensive projects
-goccc -cache-5m                    # Use 5-minute cache pricing instead of 1-hour
 goccc -days 30 -all -json          # JSON output for scripting
 goccc -json | jq '.summary.total_cost'  # Pipe to jq for custom analysis
 goccc -currency-symbol "€" -currency-rate 0.92  # One-off currency override
@@ -187,7 +185,6 @@ Thresholds are in USD (before currency conversion). They apply to the terminal o
 | `-projects` | | `false` | Show per-project breakdown |
 | `-all` | | `false` | Show all breakdowns (daily + projects) |
 | `-top` | `-n` | `0` | Max entries in breakdowns (0 = all) |
-| `-cache-5m` | | `false` | Price cache writes at 5-minute tier (1.25x input) instead of 1-hour (2x) |
 | `-json` | | `false` | Output as JSON |
 | `-no-color` | | `false` | Disable colored output (also respects `NO_COLOR` env) |
 | `-base-dir` | | `~/.claude` | Base directory for Claude Code data |
@@ -198,14 +195,6 @@ Thresholds are in USD (before currency conversion). They apply to the terminal o
 | `-currency-rate` | | `0` | Override exchange rate from USD (requires `-currency-symbol`) |
 | `-version` | `-V` | | Print version and exit |
 
-## How It Works
-
-goccc parses Claude Code's JSONL conversation logs from `~/.claude/projects/`, deduplicates streaming responses (by `requestId`), and calculates costs using [Anthropic's published pricing](https://platform.claude.com/docs/en/about-claude/pricing) — including cache write tiers, long-context premiums (>200K input), and web search costs.
-
-### Cache Write Pricing
-
-Claude Code JSONL logs report all cache writes as `ephemeral_5m`, but Anthropic billing matches 1-hour tier pricing (2x input price). goccc defaults to 1-hour pricing to align with actual bills. Use `-cache-5m` to switch to 5-minute pricing (1.25x input) if your billing differs.
-
 ## Preserving Log History
 
 Claude Code periodically deletes old log files. To keep more history for cost tracking, increase the cleanup period in `~/.claude/settings.json`:

fixture_test.go

@@ -46,7 +46,7 @@ func TestFixture_RealisticConversation(t *testing.T) {
 	//   req_main_001: in=15000  out=2500  cr=50000  cw5m=8000  cw1h=3000
 	//   req_main_002: in=22000  out=4800  cr=62000  cw5m=0     cw1h=5000
 	//   req_main_003: in=30000  out=6200  cr=70000  cw5m=2000  cw1h=0
-	//   req_main_004: in=35000  out=3500  cr=80000  cw5m=4000  cw1h=0     (flat fallback)
+	//   req_main_004: in=35000  out=3500  cr=80000  cw5m=0     cw1h=4000  (flat fallback → 1h)
 
 	opus := data.ModelUsage["claude-opus-4-6"]
 	if opus == nil {
@@ -56,17 +56,17 @@ func TestFixture_RealisticConversation(t *testing.T) {
 	assertInt(t, "opus.InputTokens", opus.InputTokens, 102000)
 	assertInt(t, "opus.OutputTokens", opus.OutputTokens, 17000)
 	assertInt(t, "opus.CacheRead", opus.CacheRead, 262000)
-	assertInt(t, "opus.CacheWrite5m", opus.CacheWrite5m, 0)
-	assertInt(t, "opus.CacheWrite1h", opus.CacheWrite1h, 22000)
+	assertInt(t, "opus.CacheWrite5m", opus.CacheWrite5m, 10000)
+	assertInt(t, "opus.CacheWrite1h", opus.CacheWrite1h, 12000)
 
 	// Opus cost per request (pricing: Input=$5/M, Output=$25/M,
-	//   CacheWrite1h=$10/M, CacheRead=$0.50/M — all writes treated as 1h):
-	//   req_main_001: 0.075 + 0.0625  + 0.11   + 0.025  = 0.2725
-	//   req_main_002: 0.11  + 0.12    + 0.05   + 0.031  = 0.311
-	//   req_main_003: 0.15  + 0.155   + 0.02   + 0.035  = 0.36
-	//   req_main_004: 0.175 + 0.0875  + 0.04   + 0.04   = 0.3425
-	//   Total: 1.286
-	assertCost(t, "opus.Cost", opus.Cost, 1.286)
+	//   CacheWrite5m=$6.25/M, CacheWrite1h=$10/M, CacheRead=$0.50/M):
+	//   req_main_001: 0.075  + 0.0625 + 0.05   + 0.03  + 0.025  = 0.2425
+	//   req_main_002: 0.11   + 0.12   + 0      + 0.05  + 0.031  = 0.311
+	//   req_main_003: 0.15   + 0.155  + 0.0125 + 0     + 0.035  = 0.3525
+	//   req_main_004: 0.175  + 0.0875 + 0      + 0.04  + 0.04   = 0.3425 (flat fallback → 1h)
+	//   Total: 1.2485
+	assertCost(t, "opus.Cost", opus.Cost, 1.2485)
 
 	// --- Haiku 4.5 model bucket ---
 	// Final values after dedup:
@@ -82,16 +82,16 @@ func TestFixture_RealisticConversation(t *testing.T) {
 	assertInt(t, "haiku.InputTokens", haiku.InputTokens, 19000)
 	assertInt(t, "haiku.OutputTokens", haiku.OutputTokens, 4900)
 	assertInt(t, "haiku.CacheRead", haiku.CacheRead, 45000)
-	assertInt(t, "haiku.CacheWrite5m", haiku.CacheWrite5m, 0)
-	assertInt(t, "haiku.CacheWrite1h", haiku.CacheWrite1h, 6500)
+	assertInt(t, "haiku.CacheWrite5m", haiku.CacheWrite5m, 4500)
+	assertInt(t, "haiku.CacheWrite1h", haiku.CacheWrite1h, 2000)
 
 	// Haiku cost per request (pricing: Input=$1/M, Output=$5/M,
-	//   CacheWrite1h=$2/M, CacheRead=$0.10/M — all writes treated as 1h):
-	//   req_sub_001: 0.005  + 0.006  + 0.006  + 0.0012 = 0.0182
-	//   req_sub_002: 0.008  + 0.014  + 0.004  + 0.0015 = 0.0275
-	//   req_sub_003: 0.006  + 0.0045 + 0.003  + 0.0018 = 0.0153
-	//   Total: 0.061
-	assertCost(t, "haiku.Cost", haiku.Cost, 0.061)
+	//   CacheWrite5m=$1.25/M, CacheWrite1h=$2/M, CacheRead=$0.10/M):
+	//   req_sub_001: 0.005 + 0.006 + 0.00375 + 0      + 0.0012 = 0.01595
+	//   req_sub_002: 0.008 + 0.014 + 0       + 0.004  + 0.0015 = 0.0275
+	//   req_sub_003: 0.006 + 0.0045+ 0.001875+ 0      + 0.0018 = 0.014175
+	//   Total: 0.057625
+	assertCost(t, "haiku.Cost", haiku.Cost, 0.057625)
 
 	// --- No other models should exist ---
 	if len(data.ModelUsage) != 2 {
@@ -108,8 +108,8 @@ func TestFixture_RealisticConversation(t *testing.T) {
 	if day18opus := day18["claude-opus-4-6"]; day18opus != nil {
 		assertInt(t, "day18.opus.Requests", day18opus.Requests, 2)
 		assertInt(t, "day18.opus.InputTokens", day18opus.InputTokens, 37000)
-		// req_main_001 (0.2725) + req_main_002 (0.311)
-		assertCost(t, "day18.opus.Cost", day18opus.Cost, 0.5835)
+		// req_main_001 (0.2425) + req_main_002 (0.311)
+		assertCost(t, "day18.opus.Cost", day18opus.Cost, 0.5535)
 	} else {
 		t.Error("missing opus bucket for 2026-02-18")
 	}
@@ -121,14 +121,14 @@ func TestFixture_RealisticConversation(t *testing.T) {
 	}
 	if day19opus := day19["claude-opus-4-6"]; day19opus != nil {
 		assertInt(t, "day19.opus.Requests", day19opus.Requests, 2)
-		// req_main_003 (0.36) + req_main_004 (0.3425)
-		assertCost(t, "day19.opus.Cost", day19opus.Cost, 0.7025)
+		// req_main_003 (0.3525) + req_main_004 (0.3425)
+		assertCost(t, "day19.opus.Cost", day19opus.Cost, 0.695)
 	} else {
 		t.Error("missing opus bucket for 2026-02-19")
 	}
 	if day19haiku := day19["claude-haiku-4-5-20251001"]; day19haiku != nil {
 		assertInt(t, "day19.haiku.Requests", day19haiku.Requests, 3)
-		assertCost(t, "day19.haiku.Cost", day19haiku.Cost, 0.061)
+		assertCost(t, "day19.haiku.Cost", day19haiku.Cost, 0.057625)
 	} else {
 		t.Error("missing haiku bucket for 2026-02-19")
 	}
@@ -142,8 +142,8 @@ func TestFixture_RealisticConversation(t *testing.T) {
 	if len(proj) != 2 {
 		t.Errorf("project has %d models, want 2", len(proj))
 	}
-	assertCost(t, "project.opus.Cost", proj["claude-opus-4-6"].Cost, 1.286)
-	assertCost(t, "project.haiku.Cost", proj["claude-haiku-4-5-20251001"].Cost, 0.061)
+	assertCost(t, "project.opus.Cost", proj["claude-opus-4-6"].Cost, 1.2485)
+	assertCost(t, "project.haiku.Cost", proj["claude-haiku-4-5-20251001"].Cost, 0.057625)
 
 	// --- Branch aggregation ---
 	// All fixture entries have gitBranch:"main"
@@ -158,8 +158,8 @@ func TestFixture_RealisticConversation(t *testing.T) {
 	if len(mainBranch) != 2 {
 		t.Errorf("expected 2 models in main branch, got %d", len(mainBranch))
 	}
-	assertCost(t, "branch.main.opus.Cost", mainBranch["claude-opus-4-6"].Cost, 1.286)
-	assertCost(t, "branch.main.haiku.Cost", mainBranch["claude-haiku-4-5-20251001"].Cost, 0.061)
+	assertCost(t, "branch.main.opus.Cost", mainBranch["claude-opus-4-6"].Cost, 1.2485)
+	assertCost(t, "branch.main.haiku.Cost", mainBranch["claude-haiku-4-5-20251001"].Cost, 0.057625)
 }
 
 func TestFixture_SyntheticEntriesSkipped(t *testing.T) {

format.go

@@ -302,9 +302,6 @@ func printSummary(data *ParseResult, opts OutputOptions) {
 	if data.ParseErrors > 0 {
 		dim.Printf("  (%d parse errors skipped)\n", data.ParseErrors)
 	}
-	if cacheWriteAs1h {
-		dim.Println("  Cache writes priced at 1h tier (2x input); use -cache-5m for 1.25x")
-	}
 	if activeCurrency.Rate > 0 {
 		if activeCurrency.Code != "" {
 			dim.Printf("  Costs in %s (1 USD = %.4f %s)\n", activeCurrency.Code, activeCurrency.Rate, activeCurrency.Code)
@@ -349,7 +346,7 @@ func printSummary(data *ParseResult, opts OutputOptions) {
 		dim.Printf("  Web searches: %d (%s)\n", totals.WebSearches, fmtCost(float64(totals.WebSearches)*webSearchCostPerSearch))
 	}
 	if totals.LongCtxRequests > 0 {
-		dim.Printf("  Long-context requests (>200K): %d (premium pricing applied)\n", totals.LongCtxRequests)
+		dim.Printf("  Long-context requests (>%dK): %d (premium pricing applied)\n", longCtxThreshold/1000, totals.LongCtxRequests)
 	}
 	fmt.Println()
 

main.go

@@ -56,7 +56,6 @@ func main() {
 	statusline := flag.Bool("statusline", false, "Statusline mode: read session JSON from stdin, output formatted cost line")
 	sessionEnd := flag.Bool("session-end", false, "Session end hook mode: read SessionEnd JSON from stdin, print cost summary")
 	noMCP := flag.Bool("no-mcp", false, "Hide MCP servers from statusline output")
-	cache5m := flag.Bool("cache-5m", false, "Price cache writes at 5-minute tier (1.25x) instead of 1-hour (2x)")
 	currencySymbolFlag := flag.String("currency-symbol", "", "Override currency symbol (requires -currency-rate)")
 	currencyRateFlag := flag.Float64("currency-rate", 0, "Override exchange rate from USD (requires -currency-symbol)")
 
@@ -93,10 +92,6 @@ func main() {
 		noColorFlag = true
 	}
 
-	if *cache5m {
-		cacheWriteAs1h = false
-	}
-
 	if err := initConfig(*currencySymbolFlag, *currencyRateFlag); err != nil {
 		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
 		os.Exit(1)

parser_test.go

@@ -443,20 +443,20 @@ func TestCacheTokenAggregation(t *testing.T) {
 	if opus.CacheRead != 800 {
 		t.Errorf("expected cache_read=800, got %d", opus.CacheRead)
 	}
-	// All cache writes treated as 1h (default): 5m(200+0)→1h, plus original 1h(100+150)
-	if opus.CacheWrite5m != 0 {
-		t.Errorf("expected cache_write_5m=0 (all promoted to 1h), got %d", opus.CacheWrite5m)
+	// req_1: 5m=200, 1h=100; req_2: 5m=0, 1h=150
+	if opus.CacheWrite5m != 200 {
+		t.Errorf("expected cache_write_5m=200, got %d", opus.CacheWrite5m)
 	}
-	if opus.CacheWrite1h != 450 {
-		t.Errorf("expected cache_write_1h=450, got %d", opus.CacheWrite1h)
+	if opus.CacheWrite1h != 250 {
+		t.Errorf("expected cache_write_1h=250, got %d", opus.CacheWrite1h)
 	}
 	if opus.TotalCacheWrite() != 450 {
 		t.Errorf("expected total_cache_write=450, got %d", opus.TotalCacheWrite())
 	}
 }
 
 func TestCacheTokenFallback_FlatField(t *testing.T) {
-	// When cache_creation is nil, cache_creation_input_tokens falls back to 5m
+	// When cache_creation is nil, cache_creation_input_tokens defaults to 1h
 	line := `{"type":"assistant","requestId":"req_flat","timestamp":` +
 		fmt.Sprintf("%q", ts(0, 10)) +
 		`,"message":{"model":"claude-opus-4-6","role":"assistant","usage":{"input_tokens":100,"output_tokens":50,"cache_read_input_tokens":0,"cache_creation_input_tokens":500}}}`
@@ -467,9 +467,8 @@ func TestCacheTokenFallback_FlatField(t *testing.T) {
 		t.Fatal(err)
 	}
 	opus := data.ModelUsage["claude-opus-4-6"]
-	// Flat fallback → 5m → promoted to 1h (default)
 	if opus.CacheWrite5m != 0 {
-		t.Errorf("expected cache_write_5m=0 (promoted to 1h), got %d", opus.CacheWrite5m)
+		t.Errorf("expected cache_write_5m=0, got %d", opus.CacheWrite5m)
 	}
 	if opus.CacheWrite1h != 500 {
 		t.Errorf("expected cache_write_1h=500, got %d", opus.CacheWrite1h)