Keep Codex Auto-Review Visible and Price Grok Proxy Logs - #111
Merged
Conversation
Re-implement upstream openusage robinebers#1085 and robinebers#1125 on Runway's split scanner/aggregation path: keep the measured codex-auto-review slug in breakdowns, price it through the dated GPT fallback, and map post-2026-07-09 auto-review to GPT-5.6 Luna (25x cheaper than gpt-5.5). Also alias grok-proxy to Grok Build (upstream robinebers#1123). Co-authored-by: Matt Stallone <mstallone@users.noreply.github.com>
mstallone
marked this pull request as ready for review
August 22, 2026 20:43
mstallone
added a commit
that referenced
this pull request
Sep 5, 2026
## TL;DR Selective re-implementation of the OpenUsage commits since Runway #111 that still apply: Claude Desktop's account-prefixed token caches, Claude spend tiles without an OAuth login, Grok subagent session ledgers, Codex Business Premium, Cursor's Models/Other Models labels, and new model rates. ## What was happening - Upstream has moved on since #111. Each new OpenUsage commit was reviewed against Runway's architecture, existing ports, and the "don't bloat" bar. - Recent Claude Desktop builds store tokens under `acct:<user>|<legacy key>` (openusage robinebers#1212). Runway expected the client UUID first and skipped those entries, so a Desktop-only login showed Not logged in. - Claude returned a hard authentication error before scanning local logs when no OAuth login existed (openusage robinebers#1138), so API-key gateway users lost Today/Yesterday/Last 30 Days. - Grok's scanner skipped every `subagent*` session (openusage robinebers#1193). Child work that the coordinator turn did not include disappeared from spend. - Codex's `self_serve_business_prolite` entitlement rendered as "Self Serve Business Prolite" (openusage robinebers#1194). - Cursor's dashboard now calls the two model pools **Cursor Models** and **Other Models**; Runway still said Auto Usage / API Usage (openusage robinebers#1134, labels only). - GPT-6 Astra, Gemini 3.8 Flash, Fable 5.1, GLM 5.3, and Grok Bot CSV slugs had no supplement entries, so those rows tripped the unpriced-model warning. ## What this changes - Desktop cache selection strips the `acct:<user>|` prefix, keeps only the signed-in account (from `lastKnownAccountUuid`), and lets a scoped tombstone suppress the matching legacy V1 alias. - Unauthenticated Claude refreshes still scan local logs. Spend tiles render under the existing Not logged in notice when those logs contain usage; an empty machine stays a hard error card. - Grok scans every durable `updates.jsonl` ledger. Prompt-id dedup still drops forked parent replays. `summary.json` is no longer required to keep a ledger. - Codex maps `self_serve_business_prolite` to **Business Premium**. - Cursor widget IDs are unchanged. Titles/labels become Cursor Models / Other Models to match Cursor's dashboard. - Pricing supplement: GPT-6 Astra (OpenAI card, 2× fast), Gemini 3.8 Flash (Cursor table, $3.50 output), Fable 5.1, GLM 5.3, and `grok-bot-*` → Grok 4.6. ## Heads-up Reviewed and **not** ported, with reasons: - **openusage robinebers#1116 / robinebers#1127 / robinebers#1185** (analytics ping, PostHog) — Runway removed analytics in #9. - **openusage robinebers#1111 / robinebers#1136 / robinebers#1106** (scroll / Settings lag / SVG parse) — Runway already has `ReorderFrameStore`, parsed-once `ProviderMark`, and the rebuilt popover path. Taking their patch would duplicate that work. - **openusage robinebers#1137 / robinebers#1165 / robinebers#1141** (Codex Session default, Fable order) — Runway already hides Codex Session by default and already places Fable directly below Weekly. Layout defaults stay an owner decision. - **openusage robinebers#1134 Grok Bot meter** — new Cursor metric. AGENTS.md requires owner confirmation of the four defaults before adding it; this PR only takes the dashboard label rename and the `grok-bot-*` pricing aliases. - **openusage robinebers#1139** (Antigravity local spend) — new scanner, protobuf decoder, and new metrics. Too large for this wave and needs the same default-placement call. - **openusage robinebers#1195** (OpenCode Codex OAuth attribution) — new scanner sharing Codex request pricing. Real feature, own follow-up; folding it in here would bloat the PR. - **openusage robinebers#1164** (Claude multi-account) — Runway already discovers Claude homes and gives each account its own card. - **openusage robinebers#1177** (Codex fallback pricing Settings) — extra Settings surface; earlier port waves skipped extra reset/settings chrome for the same reason. - **openusage robinebers#1179** (dead pin ID remap) — OpenUsage layout keys and old Antigravity IDs. Runway installs never held those keys (different defaults domain), and schema v3/v4 are already used for the beta-channel and telemetry retirements. - **openusage robinebers#1172** (bound log memory) — Runway already rejects non-finite / overflowing token counts at the parse boundary instead of clamping them. - **openusage robinebers#1167 / robinebers#1016** (sub-1% "Not started", untouched pacing) — already in Runway (`used <= 0`, `Pace.evaluate` returns nil when unused). - **openusage robinebers#1128** (Sparkle 2.9.6) — still a relevant bump; leaving it to Dependabot rather than mixing a package-resolution change into this accuracy PR. - **openusage robinebers#1170 / robinebers#1159 / robinebers#1143 / robinebers#1163** (contribution policy, screenshot assets, test-suite cleanup) — not user-facing on Runway, or would churn tests without changing behavior. - **openusage robinebers#1196** (legacy Codex iCloud identity) — Runway's sync identity path is already fork-specific. Gemini 3.8 Flash output is **$3.50**, from [Cursor's table](https://cursor.com/docs/models-and-pricing.md), not upstream's $3.75 Google API rate. That matches how Runway priced Gemini 3.7. ## Tests - Desktop: prefixed key for the signed-in account wins; foreign `acct:` keys are ignored; a scoped V2 tombstone suppresses the V1 alias; `load()` reads `lastKnownAccountUuid`. - Claude: no credentials plus local logs → spend tiles and Not logged in, not an error card. Empty machine still errors. - Grok: subagent ledger is included; fork replay of a shared prompt still counts once. - Codex: `self_serve_business_prolite` → Business Premium, weekly-only window. - Pricing: Astra / 3.8 Flash / Fable 5.1 / GLM 5.3 / grok-bot slugs and router labels resolve. `testEveryAliasCanonicalResolves` covers the new rules. - Cursor mapper tests updated to the new labels; widget IDs unchanged. `swift test --filter "ClaudeDesktopAuthStoreTests|ClaudeProviderTests|CursorProviderTests|CursorUsageSummaryTests|GrokLogUsageScannerTests|CodexUsageMapperTests|PricingBundledResourceTests|LayoutStoreTests"` — 179 tests, 1 skipped, 0 failures.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
TL;DR
Selective re-implementation of the new upstream OpenUsage commits that still apply on Runway: Codex auto-review stays a first-class model in spend breakdowns and prices as GPT-5.6 Luna from 2026-07-09, and Grok CLI's
grok-proxyslug resolves to Grok Build.What was happening
codex-auto-reviewwith its dated GPT fallback before aggregation (openusage Track Codex auto-review separately from pricing model robinebers/openusage#1085), so the breakdown showed gpt-5.5 instead of auto-review.grok-proxyfor Grok Build (openusage fix(pricing): alias grok-proxy to Grok Build robinebers/openusage#1123); that slug had no alias, so those tokens were dropped from the spend tiles.What this changes
codex-auto-reviewslug and stores the dated GPT fallback onEvent.pricingModelonly for cost. Aggregation keys the rate cache by both slugs so a day that spans the Luna cutoff does not reuse the first event's rates.("2026-07-09", "gpt-5.6-luna")at the top of the auto-review fallback table (ours; ccusage's snapshot still stops at gpt-5.5). Bumps the Codex JSONL cache schema to 2 so already-remapped events are reparsed.grok-proxy→grok-build-0.1and stampsupdated_atwith a same-day ISO timestamp so the feed wins over today's date-only cache.Heads-up
Reviewed and not ported, with reasons:
ReorderFrameStore, parsed-onceProviderMark, row-local reorder gestures, and the rebuilt popover scroll path. Taking their patch would duplicate and fight that work.Package.resolved'soriginHash. Dependabot is already scheduled weekly; worth a dedicated follow-up.main.Tests
codex-auto-reviewwhile costing the fallback; Luna and gpt-5.5 auto-review events on either side of the cutoff keep independent rates (guards the rate-cache key).grok-proxyresolves to the same rates asgrok-build-0.1.swift testcould not be run here. CI onmacos-26is the compile/test gate.