Port Upstream Accuracy and Pricing Fixes

[mstallone]

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 Keep Codex Auto-Review Visible and Price Grok Proxy Logs #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 Fix Claude Desktop Account-Prefixed Credential Caches robinebers/openusage#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 fix(claude): load local spend without OAuth credentials robinebers/openusage#1138), so API-key gateway users lost Today/Yesterday/Last 30 Days.
• Grok's scanner skipped every subagent* session (openusage fix(grok): include subagent session usage robinebers/openusage#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 fix(codex): recognize Business Premium entitlement robinebers/openusage#1194).
• Cursor's dashboard now calls the two model pools Cursor Models and Other Models; Runway still said Auto Usage / API Usage (openusage feat(cursor): add Grok Bot usage and match dashboard model names robinebers/openusage#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 Keep the daily active ping on when extra analytics are off robinebers/openusage#1116 / chore(deps): bump github.com/posthog/posthog-ios from 3.69.0 to 3.69.6 robinebers/openusage#1127 / chore(deps): bump github.com/posthog/posthog-ios from 3.69.6 to 3.69.12 robinebers/openusage#1185 (analytics ping, PostHog) — Runway removed analytics in Remove usage analytics #9.
• openusage perf: reduce scrolling update overhead robinebers/openusage#1111 / Fix laggy screen transitions and Settings navigation robinebers/openusage#1136 / fix: restore smooth translucent scrolling robinebers/openusage#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 Hide Codex Session by default robinebers/openusage#1137 / fix(codex): restore Session by default robinebers/openusage#1165 / fix(claude): show Fable directly below Weekly robinebers/openusage#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 feat(cursor): add Grok Bot usage and match dashboard model names robinebers/openusage#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 Add Antigravity local spend and usage history robinebers/openusage#1139 (Antigravity local spend) — new scanner, protobuf decoder, and new metrics. Too large for this wave and needs the same default-placement call.
• openusage feat(codex): attribute OpenCode Codex OAuth usage and share Codex request pricing robinebers/openusage#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 Support multiple Claude accounts robinebers/openusage#1164 (Claude multi-account) — Runway already discovers Claude homes and gives each account its own card.
• openusage Add optional fallback pricing for Codex usage robinebers/openusage#1177 (Codex fallback pricing Settings) — extra Settings surface; earlier port waves skipped extra reset/settings chrome for the same reason.
• openusage fix(settings): remap dead menu-bar pin IDs on upgrade (schema v3) robinebers/openusage#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 fix: bound usage log memory and guard malformed token counts robinebers/openusage#1172 (bound log memory) — Runway already rejects non-finite / overflowing token counts at the parse boundary instead of clamping them.
• openusage fix(claude): show reset countdown for sub-1% sessions instead of "Not started" robinebers/openusage#1167 / Stop showing "~100% left at reset" on untouched meters robinebers/openusage#1016 (sub-1% "Not started", untouched pacing) — already in Runway (used <= 0, Pace.evaluate returns nil when unused).
• openusage chore(deps): bump github.com/sparkle-project/sparkle from 2.9.5 to 2.9.6 robinebers/openusage#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 Enforce approved and assigned external contributions robinebers/openusage#1170 / Remove obsolete documentation screenshot assets robinebers/openusage#1159 / Simplify test suites without weakening coverage robinebers/openusage#1143 / Deduplicate test fixtures and prune subsumed tests robinebers/openusage#1163 (contribution policy, screenshot assets, test-suite cleanup) — not user-facing on Runway, or would churn tests without changing behavior.
• openusage fix(sync): accept legacy Codex account identity metadata robinebers/openusage#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, 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.

[chatgpt-codex-connector]

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Repo admins can enable using credits for code reviews in their settings.

[Copilot]

🟡 Changes recommended

ClaudeDesktopAuthStore.selectCredential now passes Dictionary.filter(...) into a function expecting a Dictionary, which will not type-check without converting the filtered result back to [CacheKey: Any].

Once you've addressed the issues Copilot identified, you can request another Copilot review.

Pull request overview

Ports a targeted set of upstream accuracy/pricing fixes into Runway’s SwiftUI macOS app, improving provider log scanning and pricing resolution while keeping UI/widget identities stable.

Changes:

• Updates Claude Desktop auth selection (account-prefixed token cache keys) and allows unauthenticated Claude refreshes to still surface local spend tiles when logs exist.
• Expands Grok local session scanning to include subagent/resumed ledgers and updates Cursor/Codex labeling/mapping to match upstream naming and entitlements.
• Extends pricing_supplement.json with new model rates/aliases and adds/updates regression tests and docs accordingly.

File summaries

File	Description
Tests/RunwayTests/PricingBundledResourceTests.swift	Adds assertions for new supplement-priced models and aliases.
Tests/RunwayTests/GrokLogUsageScannerTests.swift	Updates expectations to include subagent session usage while deduplicating fork replays.
Tests/RunwayTests/CursorUsageSummaryTests.swift	Renames expected Cursor usage line labels to “Cursor models” / “Other models”.
Tests/RunwayTests/CursorProviderTests.swift	Updates Cursor mapper/provider tests for renamed labels while keeping IDs stable.
Tests/RunwayTests/CodexProviderTests.swift	Adds regression coverage for Business Premium entitlement mapping.
Tests/RunwayTests/ClaudeProviderTests.swift	Adds coverage for unauthenticated Claude refresh still showing local spend when logs exist.
Tests/RunwayTests/ClaudeDesktopAuthStoreTests.swift	Adds coverage for account-prefixed Desktop token caches and tombstone behavior.
Sources/Runway/Resources/pricing_supplement.json	Adds new model rates, fast multiplier, and alias rules (Gemini 3.8 Flash, GPT-6 Astra, Fable 5.1, GLM 5.3, grok-bot slugs).
Sources/Runway/Providers/Grok/GrokLogUsageScanner.swift	Switches session discovery to include all updates.jsonl ledgers (including subagents/resumes).
Sources/Runway/Providers/Cursor/CursorUsageSummaryMapper.swift	Renames Cursor plan usage labels to match Cursor dashboard terminology.
Sources/Runway/Providers/Cursor/CursorUsageMapper.swift	Renames Cursor usage meter labels to “Cursor models” / “Other models”.
Sources/Runway/Providers/Cursor/CursorProvider.swift	Renames Cursor metric titles/labels while preserving widget IDs.
Sources/Runway/Providers/Codex/CodexUsageMapper.swift	Maps self_serve_business_prolite to “Business Premium”.
Sources/Runway/Providers/Claude/ClaudeProvider.swift	Uses local log scan for unauthenticated installs; only shows hard error when there’s no local usage.
Sources/Runway/Providers/Claude/ClaudeDesktopAuthStore.swift	Implements account-prefixed Desktop cache normalization and selection.
README.md	Updates Cursor feature blurb to new metric naming.
docs/providers/grok.md	Updates Grok spend-tile description to reflect inclusion of subagent/resumed sessions.
docs/providers/cursor.md	Renames documented Cursor meters to “Cursor Models” / “Other Models”.
docs/providers/codex.md	Documents Business Premium mapping for self_serve_business_prolite.
docs/providers/claude.md	Documents account-prefixed Desktop tokens and unauthenticated local spend behavior.
docs/menu-bar.md	Updates default-star naming for the renamed Cursor metrics.

Review details

• Files reviewed: 21/21 changed files
• Comments generated: 1
• Review effort level: Lite

---

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.