{"entries":[{"lastCommit":{"author":{"email":"1560508+ryoppippi@users.noreply.github.com","name":"ryoppippi","when":"2026-08-15T12:05:10.000000+01:00"},"committer":{"email":"noreply@github.com","name":"GitHub","when":"2026-08-15T12:05:10.000000+01:00"},"hash":"b936c29211b9bc92d9cd3215b8b8d132c21de288","message":"fix(pricing): take models.dev rates from the authoring catalog (#1541)\n\n* fix(pricing): take models.dev rates from the authoring catalog\n\nmodels.dev publishes one catalog per provider, so every model appears once\nper provider that serves it. Resellers publish their own rates, and the\ngenerator picked between duplicates by how many fields an entry carried,\nwith a hardcoded preference for three provider ids. Two problems followed.\n\nThe committed snapshot billed resold models at marketplace rates. It held\n`moonshotai/kimi-k2.7-code` at 0.73 USD/Mtok, which is OpenRouter's\ndiscounted rate rather than MoonshotAI's 0.95 list rate, alongside a\ncorrect `kimi-k2.7-code` at 0.95; which one a lookup resolved depended on\nthe fuzzy key match. `moonshotai/kimi-k3`, `moonshotai/Kimi-K3` and\n`kimi-k3` each carried a different price for the same model.\n\nCoverage was also decided by a model-name pattern, `/claude|anthropic|kimi\n|moonshot/i`, so any family nobody had added to that pattern was unpriced\noffline even when models.dev published it and LiteLLM did not.\n`xai/grok-build-0.1` is the current example: models.dev carries it under\nits authoring catalog, LiteLLM has no entry at all, and `--offline`\nreported no cost for it.\n\nRank catalogs by trust instead. The authoring catalog wins, cloud\nplatforms that resell at list price plus a published regional premium come\nnext, and everything else is a last resort used only for models the\nauthored catalog still knows - which is what keeps retired releases such as\n`claude-3-5-haiku-20241022`, now listed by resellers only. Authorship comes\nfrom the `models//.toml` directory scan rather than a provider\nlist, so new authors need no maintenance; only `zai`, which serves models\nauthored under `models/zhipuai/`, needs an alias entry.\n\nThe name pattern is gone, and entries whose costs are all zero (flat-fee\nplans such as `kimi-for-coding`) or that price assets rather than output\ntext tokens are skipped instead.\n\nThe snapshot grows from 335 to 422 entries. No surviving entry changes\nprice; the 234 dropped keys are reseller-invented aliases and speed tiers\n(`kimi-k2.6-nitro`, `accounts/fireworks/...`, `TEE/...`) and dotted or\n`-thinking` spellings the fuzzy matcher already resolves to their base key.\n\nThe derived provider trust lists are emitted alongside the snapshot for the\nRust runtime loader, which sees only the live api.json and so cannot scan\nthe authored catalog itself.\n\n* perf(pricing): minify the embedded models.dev snapshot\n\nThe committed snapshot is indented so its regeneration diffs stay\nreviewable, and `include_str!` embedded it byte for byte, so the\nindentation shipped in every binary. At 422 entries the whitespace is\nabout 19 KiB of the 58 KiB file.\n\nStrip it in `build.rs` on the way in, the same place the LiteLLM snapshot\nis already compacted. The committed file keeps its formatting.\n\nTogether with the broader coverage this keeps the release binary flat:\n3,162,832 bytes before, 3,162,880 after, for 87 more priced models.\n\n* fix(pricing): rank models.dev catalogs when refreshing pricing online\n\nThe runtime models.dev fallback loaded providers straight out of an\n`FxHashMap`, and the first catalog to claim a model id keeps it. Which\ncatalog that was therefore depended on hash iteration order, so a reseller\ncould supply a model the authoring catalog also publishes, and the\nselection could change whenever models.dev adds or removes a provider.\n`grok-build-0.1`, for example, is served by 13 catalogs whose input rates\nrange from 0 to 1 USD/Mtok.\n\nRank the catalogs before loading, using the provider trust lists the\nsnapshot generator derives from the authored catalog, and sort by provider\nid within a tier so the result no longer depends on hash order at all.\n\nAlso skip entries whose input and output costs are both zero. Flat-fee\nsubscription catalogs publish those - `kimi-for-coding` is one, and it is\namong the 13 that serve `grok-build-0.1` - so loading one reported every\nrequest as free. The snapshot generator already skipped them; the runtime\nloader did not.\n\n* fix(pricing): keep asset-priced models out of the models.dev snapshot\n\nDropping the model-name filter let two kinds of non-token pricing into the\nsnapshot, where the runtime divides the rate by a million and multiplies it\nby token counts.\n\n`whisper-large-v3` prices per second of audio. It reached the snapshot at\n0.003 USD because the catalogs serving it advertise text output, and the\nprevious check only looked at the output side.\n\n`gemini-2.5-flash-image` and `gemini-3-pro-image-preview` price per\ngenerated image - 30 and 120 USD respectively. Google authors both with\nimage output, so the output check did reject Google's entry, but `302ai`\nlists the same models as text-only and its entry was embedded instead. A\nsloppier reseller description could therefore override the author's.\n\nRead the modalities off the authored catalog rather than the catalog being\nloaded, so one reseller's description cannot decide eligibility, and require\nthat the input modalities include text. A model that accepts no text is a\ntranscription or vision-only endpoint billed by duration; accepting audio,\nvideo, image or PDF alongside text is normal for chat models and is\ntokenised, so `kimi-k3` and `gemini-3-flash-preview`, which take video and\naudio input, stay eligible. An earlier attempt rejected any audio or video\ninput and dropped both of them.\n\nThe snapshot goes from 422 to 418 entries. The Rust test asserts both\ndirections against the committed artifact so a future regeneration cannot\nreintroduce either case.\n\n* fix(pricing): apply the snapshot's selection rules to live models.dev too\n\nThe asset-priced guard and the same-tier tie-break existed only in the\nsnapshot generator, so an online refresh could still price a model the\nembedded snapshot deliberately excludes, and could pick a different catalog\nthan the snapshot for the same model. Offline and default runs disagreed.\n\nThe live `api.json` records neither who authored a model nor the authored\nmodalities, so both have to be carried in from generation time. The\ngenerated artifact therefore grows an `assetPricedModelIds` list, and is\nrenamed from `models-dev-provider-trust.json` to\n`models-dev-catalog-rules.json` now that it carries more than provider\ntrust.\n\nThe loader applies it the same way the generator does: the authored verdict\ndecides where it exists, so a reseller describing an image model as\ntext-only cannot reintroduce a per-image rate, and entries the authored\ncatalog has never seen fall back to their own modalities, which is enough to\nreject an audio-only transcriber from any catalog.\n\nSame-tier ties now compare how much pricing detail an entry carries -\nexplicit cache-read, cache-write, context limit - before falling back to the\nprovider id, matching `shouldReplaceModelsDevPricingCandidate`. That needed\nthe loader to track which catalog claimed each id during a pass, so a better\ncandidate can replace a weaker one; ids absent from that record still belong\nto another pricing source and are left alone. Replacements do not increment\nthe loaded count, which stays a count of resolved models.\n\nReported by cubic on #1541.\n\n* style(pricing): collapse the nested modality check\n\nclippy::collapsible_if. Rewriting the two checks as slice patterns reads\nbetter than collapsing the condition and drops the redundant emptiness\ntests.\n\n* fix(pricing): keep separately priced tiers of the models we carry\n\nDropping reseller-only ids took the speed and effort tiers with them:\n`kimi-k2.6-nitro`, `kimi-k2.7-code-flex`, `glm-5.2-nitro`, `claude-opus-4-6-think`\nand about 140 others. Those are their own routes at their own rates, usually\ncheaper than the author's, so resolving them to the base model by name\nsimilarity over-reports them. `kimi-k2.6-nitro` went from 0.275 to 0.95\nUSD/Mtok - 3.5x - which is worse than the reseller duplicate this series set\nout to remove.\n\nKeep a reseller entry when its id is the authored id plus a suffix, and only\nfor bare ids: an id carrying a provider path is that provider's catalog entry\nfor a model some trusted catalog publishes anyway, which is the duplicate\ncase.\n\nA tier the author prices itself does not qualify. `claude-opus-5-fast` and\n`claude-opus-4-8-fast` exist in exactly one reseller catalog at 12 USD/Mtok\nwhile Anthropic publishes 10, so taking the reseller rate would over-report\nthem; the fast multiplier the runtime already applies is correct. The check\nreads those modes from the authoring provider's catalog entry, because\n`experimental.modes` lives in `providers//models/.toml` rather\nthan in the `models/` metadata.\n\nSnapshot 418 -> 559 entries, binary 3,162,832 -> 3,179,440 bytes (+0.5%).\n`ccusage daily --until 20260728` over a real 169-day Claude and Codex log\nstays byte-identical to main in both online and offline modes.\n\nThe broader alternative - keep every reseller id that does not reduce to an\nauthored one - was measured at 1804 entries and +136 KiB, because it drags in\nevery third-party host's copy of every open-weight model.\n\n* fix(pricing): match generation's candidate ordering in the live loader\n\nThree defects in the same-tier tie-break, all reported on #1541.\n\nThe detail comparison summed how many optional fields an entry carried, but\ngeneration compares cache-read, then cache-write, then context-limit presence\nin that order. A cache-read-only entry therefore lost online to one carrying\ncache-write and a context limit, while the committed snapshot picked the\nformer. A `ModelsDevClaim` struct with the fields declared in that order\nfixes it, because `derive(PartialOrd)` compares them in declaration order.\n\nA replacement that publishes no context limit left the replaced catalog's\nlimit in `context_limits`, reporting a window the selected rates do not\nbelong to. It is now removed, and only when the id was claimed in this pass,\nso another pricing source's limit is never touched.\n\nTwo source keys in one catalog can carry the same `id`, and the first to\narrive claimed it, which meant hash iteration order decided the winner again.\nGeneration walks each catalog in key order and keeps the first of an\nequal-strength tie, so the entries are sorted by key before loading.\n\nToday's models.dev response has no such duplicate, because `generateProviders`\nsets `id` to the source key, but nothing in the schema guarantees that.\n\n* fix(treefmt): stop typos rewriting model ids in generated snapshots\n\nOne Gemini id in the models.dev snapshot ends in a clipped \"no thinking\",\nwhich typos treats as a misspelling and corrects. The committed snapshot\ntherefore carried a model id that does not exist upstream, so that model\ncould never match and would report no cost - a silent data corruption in a\nfile nobody reads by hand.\n\nThis only surfaced now because the previous commits widened the snapshot from\nthe Claude and Kimi families to every token-priced model, which is what first\npulled a typos-sensitive id into it. CI caught it as a treefmt-check failure\non the generated file.\n\nExclude the three generated snapshots from typos alone; they stay in the JSON\nformatter, which is what keeps their regeneration diffs reviewable.\n\nThe same rewrite applies to prose, so the comment explaining this cannot\nspell the id out - it was rewritten on the first `just fmt` after being\nwritten.\n\n* fix(pricing): carry the authored catalog's verdicts into the live loader\n\nThe rules artifact listed only the models the authored catalog prices per\nasset, so the live loader could reject a model the snapshot carries: an\nauthored token-priced model whose serving catalog describes it as\nimage-output fell through to that catalog's modalities and was dropped, while\ngeneration had accepted it on the authored verdict. The asymmetry only ran one\nway, so `--offline` priced the model and a default run did not.\n\nCarry `authoredModelIds` as well. An authored id absent from the asset list is\nauthored as token-priced, which settles it whatever the serving catalog\nclaims, and only ids the authored catalog never listed still fall back to live\nmodalities.\n\nThe same artifact then closes the loader's other gap. Generation embeds a\nreseller entry only when the authored catalog knows the model or when the id\nnames a separately priced tier of one; the loader checked token pricing alone,\nso an online refresh priced 1705 ids the embedded snapshot deliberately omits,\neach at that reseller's own promotional or marked-up rate. Only the tiers an\nauthor prices itself were missing from the artifact, so with `authoredModes`\nalongside the authored id set the loader can apply\n`isEmbeddableModelsDevCandidate` too, and simulating it over the pinned catalog\nnow reproduces the committed snapshot exactly: same 559 ids, same rates. The\nartifact grows to 8.0 KB.\n\nAlso rank and tie-break catalogs by `provider.id` rather than the key they are\nfiled under, which is what `provider.id ?? providerId` gives the generator.\nmodels.dev assigns the id from the directory name today, so the two agree, but\nnothing in the schema requires it.\n\nReported by cubic on #1541.\n\n* fix(pricing): stop pruning models.dev ids and gate the fuzzy lookup instead\n\nPruning ids to keep the snapshot small was the wrong lever. `PricingMap::find`\nfalls back to substring matching that prefers the longest matching key, so\nremoving an id does not make its lookups fail - it makes them resolve to\nwhichever remaining key happens to match. Three pruning rules were tried and\neach mispriced something different, measured by pricing all 829 ids either\nside of the diff knows:\n\n- reseller ids dropped: `kimi-k2-7-code` resolved to `kimi-k2.7-code-highspeed`\n and doubled, from 4.95 to 9.90 USD for 1M+1M tokens, and about 40 Claude\n spellings such as `claude-4.5-sonnet` and `claude-3-7-sonnet-latest` went\n unpriced because the authored id is `claude-sonnet-4-5` and neither spelling\n contains the other\n- tiers marked exact-only on top of that: `moonshotai/kimi-k2.7-code-highspeed`\n then fell to the base rate instead\n- bare ids kept, namespaced ones dropped: 31 ids changed price, in both\n directions\n\nKeep every id the catalog publishes, so each resolves exactly and the fuzzy\nfallback only ever sees ids models.dev has never heard of - which is where it\nwas before this branch. The rules now decide only *which* catalog's rates an id\ngets.\n\nTwo kinds of key must still stay out of the fuzzy candidates, because they\nwould answer a lookup for a different model:\n\n- a separately priced tier: `kimi-k2.7-code-highspeed`, `kimi-k2.6-nitro`,\n `claude-opus-5-fast`\n- an id with no version in it: models.dev carries one called `auto`, which\n answered `codex-auto-review` - a Codex label that has to resolve through the\n adapter's date mapping rather than be priced directly. An existing test\n caught it\n\n`PricingMap` gains an `exact_only` set, excluded from the fuzzy scan in\n`find_entry` and `context_limit_entry`, and the snapshot marks those keys.\n\nSnapshot 335 -> 2362 entries, 476 of them exact-only. The binary grows\n3,162,832 -> 3,444,032 bytes, 8.9%. That is the price of the guarantee: across\nall 829 ids, 367 are newly priced, none lost pricing, and none changed price.\n\nTwo follow-ups the online path needed for the same reasons, folded in here\nbecause the workspace cannot author a separate commit GitHub will accept:\n\n`exactOnly` is a field this commit writes into the snapshot, and a live\n`api.json` has none, so nothing was ever added to `PricingMap::exact_only`\nonline: a refreshed run put every tier back into the fuzzy scan, where a live\n`kimi-k2.7-code-highspeed` answered `kimi-k2-7-code` and `auto` answered\n`codex-auto-review`. The loader now rederives the verdict from the rules\nartifact, asking the tier half about the catalog's source key and the\nunversioned half about the pricing key it resolves to. It also stops pruning\nreseller ids with `is_embeddable`, the rule this commit dropped from\ngeneration, which had the online refresh carrying 601 ids where the snapshot\ncarries 2362. The tier check folds `@` as `normalizeModelId` does, so the 25\nVertex regional ids such as `claude-opus-5@eu` are recognized as tiers of the\nmodel they shadow. Replaying the loader over the pinned revision's catalog now\nreproduces the committed snapshot exactly: the same 2362 ids, the same rates,\nthe same 476 exact-only keys.\n\nGeneration resolves `provider.id ?? providerId` before ranking a catalog, the\nway the loader does, so a catalog filed under an alias cannot be an owner\nonline and a reseller in the snapshot. models.dev assigns that id from the\ndirectory it scanned, so the artifacts regenerate byte for byte.\n\nCo-authored-by: Codesmith \n\nTest the two gates directly: unit tests for isUnversionedModelId in the\ngenerator, and a grok candidate test whose priced key no -build candidate\ncan reach, so it exercises the strip instead of the fuzzy lookup answering\nxai/ with a key the raw form already contains.\n\n* fix(pricing): keep the fuzzy lookup off exact-only ids\n\n`exact_only` kept a separately priced tier from answering another model's\nlookup, but not the reverse: the embedded models.dev snapshot is a\nseparate map consulted only after the primary LiteLLM one misses, so\n`claude-opus-5-fast` matched LiteLLM's `claude-opus-5` in the primary\nfuzzy scan and billed the tier at list price, 5/25 instead of 12/60. The\nsame shadowing hit the regional aliases, `claude-opus-5@eu` and friends.\n\nGate the fuzzy scan on whether a consulted catalog carries the requested\nid as exact-only, so it falls through to that exact entry instead. Only a\ncarried entry gates the scan, leaving ids nothing prices exactly on the\nfuzzy path they had.\n\nCo-authored-by: Codesmith \n\n* fix(pricing): deny the fuzzy scan when an alias names an exact-only id\n\nA `CCUSAGE_MODEL_ALIASES` entry is only tried after the map has answered\nfor the spelling the log recorded, so gating on that spelling alone left\nthe tier the alias names unreachable: `claude-opus-5-turbo` aliased to\n`claude-opus-5-fast` still fuzzy-matched LiteLLM's `claude-opus-5` and\nbilled the list rate. Carry the verdict for the resolved alias into the\nfirst lookup, in the context-limit path too. Exact entries for the\nrecorded spelling keep their precedence, and the alias, the network\ncatalog and the snapshot all still resolve fuzzily on their own terms.\n\nCo-authored-by: Codesmith \n\n* perf(pricing): deflate the embedded pricing snapshots\n\nDropping the coverage filters grew the embedded models.dev snapshot to a\nquarter megabyte of JSON, all of it shipped verbatim in every binary:\n3,162,832 bytes on main to 3,444,032, 8.9%. The JSON deflates to a ninth of\nits size, so compress all three embedded snapshots in build.rs and inflate\neach one once, on first use. The committed files stay indented for reviewable\nregeneration diffs.\n\n models-dev-pricing.json 259,174 -> 28,448 bytes\n binary 3,444,032 -> 3,179,904 (+0.5% over main)\n\nThe inflate side is miniz_oxide without default features, pure Rust; under\nthe fat-LTO opt-level=z release profile the decompressor costs a few KiB.\nInflation runs once per snapshot per process and is not measurable at\nstartup. Compression runs in build.rs at maximum effort, where its cost is\npaid only when a snapshot changes.\n\nVerifying the round-trip surfaced a pre-existing wrinkle: serde_json's\ndefault float parsing is not correctly rounded, so the minification\nintroduced in an earlier commit shifted eleven prices by one ULP on their way\ninto the binary - harmless at 1e-16 relative, but it broke the invariant that\nthe embedded data equals the committed data. The build script now enables\nserde_json's float_roundtrip feature, which is host-only and costs the\nshipped binary nothing; the inflated snapshots are byte-faithful to the\ncommitted files again.\n\nRe-verified against main across every id either snapshot knows: 367 newly\npriced, none lost, none changed. The two ids that moved in the raw probe,\nTEE/kimi-k2.5 and its -thinking sibling, no longer exist at the pinned\nmodels.dev revision, so both binaries guess through the fuzzy fallback and\ntheir guesses differ - the pre-existing unknown-id behavior, not a change in\nit. Real-log reports stay byte-identical to main in both modes.\n\n* fix(pricing): gate every separator spelling of an exact-only id\n\nmodels.dev writes a regional alias as claude-opus-5@eu, and the fuzzy scan\nreads @, . and - as one separator, so a request recording claude-opus-5-eu\npassed the raw-string exact-only gate and was billed at the base model's\nlist rate. Index exact-only ids under their normalized spelling too, and\nanswer such a request from the id it names rather than losing its rate.\n\nCo-authored-by: Codesmith \n\n* fix(pricing): index dash-spelled exact-only ids by their normalized form\n\nnormalized_pricing_key borrows a key already spelled with dashes alone, so\nthe normalized index skipped it and a request writing that id with . or @\nanswered neither membership question: the fuzzy scan then billed the base\nmodel instead of the exact-only tier.\n\nCo-authored-by: Codesmith \n\n* refactor(pricing): name the failing snapshot in build panics\n\nembed_snapshot runs for two snapshots and the LiteLLM path used the same\nmessage, so a build failure did not say which file it failed on. Reported\nby CodeRabbit on #1541.\n\n* feat(pricing): price long-context tiers from models.dev data\n\nGrok, GPT-5.x and Gemini bill requests above a context boundary at higher\nrates, and `--mode calculate` ignored that everywhere the data came from\nmodels.dev: the generator dropped `cost.tiers` on the floor, and the only\ntwo-stage rates the runtime knew were a hardcoded table for six GPT-5\nmodels. On a real Grok Build log, 94 of 172 requests exceed the 200K\nboundary and were billed at half the correct input rate.\n\nThe generator now emits each model's long-context band in the upstream\n`cost.tiers` shape, so the Rust loader parses the embedded snapshot and a\nlive `api.json` response with the same code. `Pricing` holds one above-base\nband, so the band with the lowest context threshold is kept - it is the one\na request crosses first, and the handful of models publishing a second,\nhigher band would otherwise contribute nothing.\n\nModels whose base rates come from LiteLLM get the band filled in from the\nmodels.dev snapshot after every load, replacing the hardcoded\n`builtin_long_context_rates` table. The overlay consults exact ids only\n(after date-suffix and alias resolution): a fuzzy match here could graft one\nmodel's tier onto another's base rates. `long_context_split_threshold`,\nwhich the Codex aggregation uses to bucket per-request context sizes, now\nreads the same data.\n\nDeleting the table also fixes two prices it had frozen: OpenAI cut\ngpt-5.6-terra to 2/12 USD/Mtok (tier 4/18) and gpt-5.6-luna to 0.2/1.2\n(tier 0.4/1.8) after it was written, and `put_builtin_pricing` was\noverwriting the corrected rates LiteLLM already publishes - luna reported\nat five times its price. Built-in entries are now a last resort for keys\nthe snapshots miss, never an overwrite, with one exception kept: z.ai's\nGLM cache facts (no cache-write billing, own cache-read rate) are patched\nonto entries whose snapshot did not publish cache rates, base rates\nuntouched.\n\n* fix(cost): select the long-context tier by the whole context\n\nThe two-stage branch compared only `input_tokens` against the model's\nthreshold, but adapters normalize usage into the Claude shape where that\nfield is the uncached remainder. The vendor picks the tier by the request's\nwhole context, cached or not, so a turn re-reading megabytes of cached\nprompt with a few thousand fresh tokens was billed at the short-context\nrate. Grok logs are the extreme case: prompt caching leaves days where\ncache reads outnumber fresh input fifty to one, so effectively no request\never crossed the boundary.\n\nSum uncached input, cache reads and cache writes for the comparison. The\nCodex path already compares OpenAI's raw `input_tokens`, which includes\nthe cached share, so the two paths now agree on what a request's size is.\n\nBilling itself is unchanged - each bucket still bills at its own rate -\nonly the tier selection sees the full context.\n\n* fix(grok): resolve pricing candidates exactly before falling back to fuzzy\n\n`PricingMap::find` falls back to substring matching, so once the snapshot\ncarries `grok-4.5`, the raw candidate `grok-4.5-build` fuzzy-hits it on the\nfirst iteration and every later candidate is dead code - including the\n`xai/`-prefixed spellings a user pricing override may be keyed by.\n\nTry every candidate exactly first, then repeat the walk with the fuzzy\nlookup. An override naming the request's model precisely now beats a fuzzy\nhit on a shorter spelling, and with no override the result is unchanged:\nboth passes land on the same grok-4.5 rates.\n\n* fix(pricing): merge dotted and dashed spellings onto one models.dev entry\n\nmodels.dev catalogs spell the same version with dots or dashes, and each\nspelling got its own snapshot entry from whichever catalog published it.\nThe two entries then tied in the fuzzy lookup - equal length, arbitrary\ntie-break - so `grok-4.5-build` resolved to `grok-4-5`, a reseller's flat\ncopy, instead of `grok-4.5`, xAI's tiered one, and every long-context Grok\nturn was billed at the base rate even after the tiers landed.\n\nSpellings now contend for one slot keyed by the normalized id, in the\ngenerator and in the live loader alike, and the losing spelling's entry is\nremoved outright - entry, exact-only flag and context limit - or both would\nstay findable and the tie would return. The winner also gains a comparison\nstep: within a trust tier, a catalog publishing a long-context band beats\none with more cache detail, because the band is the rate data hardest to\ncome by. Lookups by the losing spelling still resolve through the fuzzy\nnormalization, now onto the surviving entry.\n\nThe snapshot shrinks from 2363 to 2159 entries, all spelling duplicates.\n\n* docs(grok): describe long-context tier estimation\n\nThe estimate now applies xAI's long-context rates when a turn's whole\ncontext crosses the model boundary, so the guide stops claiming the tiering\nis not reproduced and states the per-turn approximation instead.\n\n* test(pricing): carry the tier flag in generator candidate fixtures\n\noxlint's type-aware pass requires the new field the runtime comparison\ngained; node --test does not type-check, so it passed without it.\n\n* fix(pricing): normalize catalog verdict lookups and stop the last overwrites\n\nReview findings from cubic on #1541, all in the new tier and selection code.\n\nThe authored catalog's verdicts - asset-priced, authored, its modalities -\nwere keyed by the exact source id, so a catalog spelling a model with\ndifferent separators or case dodged them: a reseller listing\n`gemini-2-5-flash-image` as text-only would have put its per-image rate\ninto the snapshot. The verdict maps and the rules artifact now hold\nnormalized ids, and every lookup normalizes the same way generation does,\ncase folding included; the live loader's claim slots fold case too, so\ncase-variant spellings merge online exactly as they merge offline.\n\nGeneration also disagreed with the runtime about an authored model that\npublishes no modalities: the generator fell back to the serving catalog's\ndescription while the loader kept every authored id, so a mislabeling\ncatalog could make the snapshot skip what a live refresh keeps. Authored\nids without authored modalities are now token-priced in both paths.\n\nThree built-in entries still overwrote refreshed pricing - the two\nclaude-3-5-haiku spellings and z.ai's free glm-4.5-flash - and now go\nthrough the fallback and patch helpers like the rest. The GLM cache patch\nalso repairs a defaulted cache-write on entries whose cache-read rate was\npublished: `Pricing` records only read explicitness, but the derived\ndefault is recognizable exactly, being this same computation.\n\nThe long-context sum saturates instead of wrapping, so a corrupt JSONL\nline cannot flip a request under the threshold or abort under overflow\nchecks.\n\n* fix(pricing): key empty declared ids by their source and order same-id catalogs\n\nTwo live-loader gaps against generation, reported by cubic on #1541.\n\nA live catalog can declare `id` as an empty string, and the loader stored\nthe model under \"\" - a name no lookup ever asks for - where the generator's\n`selectModelsDevPricingKey` falls back to the source key. Empty ids now\nfall back the same way, for the pricing key and for the exact-only verdict\nalike.\n\nTwo catalogs can also declare the same provider id, which tied the sort and\nleft their order to hash iteration. The unique provider map key settles the\ntie now, matching the order of generation's provider-key walk.\n\n* fix(pricing): track cache-write explicitness instead of inferring it\n\nThe z.ai cache patch recognized a defaulted cache-write by its value - it\nequals `input * 1.25` - which misreads a catalog explicitly publishing that\nsame number. The heuristic was a dodge around `Pricing` only recording\ncache-read explicitness; recording both is the honest shape, so every\nconstructor now says where its cache-write rate came from: published data\nor the derived default. The patch repairs reads and writes independently\nand only ever the derived ones.\n\nReported by cubic on #1541, and it also closes the round-3 finding this\nheuristic had answered halfway.\n\nThe Grok guide's troubleshooting note still credited LiteLLM for\n`--mode calculate` estimates; it now matches the Pricing bullet above it.\n\n* fix(pricing): break exact claim ties by source key within a declared id\n\nTwo catalogs declaring the same provider id are one provider to generation,\nwhich breaks exact-strength ties by `(sourceProviderId, sourceModelId)` -\nand with the ids colliding, by the source model key. The live loader kept\nwhichever catalog arrived first instead, so a same-strength duplicate could\nresolve to a different rate online than in the snapshot. The claim slot now\nrecords the declared id and source key it was claimed under, and an exactly\nequal claim yields to a smaller source key from the same declared id.\nDiffering declared ids were already settled by arrival order, which matches\ngeneration's ascending walk.\n\nReported by pullfrog on #1541.\n\nAlso narrows the new `cache_create_explicit` field to `pub(crate)`: nothing\noutside the crate reads it, and the hawk gate fails the build for exactly\nthat.\n\n* style(pricing): make the cache-write flag private\n\nhawk: pub(crate) was still wider than its uses, which never leave the\npricing module.\n\n---------\n\nCo-authored-by: Codesmith ","tree":"8f735a3cde72f3bfd19d398eb7ef077a38c8047a"},"mode":"0100644","name":"Cargo.lock","size":33299},{"lastCommit":{"author":{"email":"1560508+ryoppippi@users.noreply.github.com","name":"ryoppippi","when":"2026-08-15T12:05:10.000000+01:00"},"committer":{"email":"noreply@github.com","name":"GitHub","when":"2026-08-15T12:05:10.000000+01:00"},"hash":"b936c29211b9bc92d9cd3215b8b8d132c21de288","message":"fix(pricing): take models.dev rates from the authoring catalog (#1541)\n\n* fix(pricing): take models.dev rates from the authoring catalog\n\nmodels.dev publishes one catalog per provider, so every model appears once\nper provider that serves it. Resellers publish their own rates, and the\ngenerator picked between duplicates by how many fields an entry carried,\nwith a hardcoded preference for three provider ids. Two problems followed.\n\nThe committed snapshot billed resold models at marketplace rates. It held\n`moonshotai/kimi-k2.7-code` at 0.73 USD/Mtok, which is OpenRouter's\ndiscounted rate rather than MoonshotAI's 0.95 list rate, alongside a\ncorrect `kimi-k2.7-code` at 0.95; which one a lookup resolved depended on\nthe fuzzy key match. `moonshotai/kimi-k3`, `moonshotai/Kimi-K3` and\n`kimi-k3` each carried a different price for the same model.\n\nCoverage was also decided by a model-name pattern, `/claude|anthropic|kimi\n|moonshot/i`, so any family nobody had added to that pattern was unpriced\noffline even when models.dev published it and LiteLLM did not.\n`xai/grok-build-0.1` is the current example: models.dev carries it under\nits authoring catalog, LiteLLM has no entry at all, and `--offline`\nreported no cost for it.\n\nRank catalogs by trust instead. The authoring catalog wins, cloud\nplatforms that resell at list price plus a published regional premium come\nnext, and everything else is a last resort used only for models the\nauthored catalog still knows - which is what keeps retired releases such as\n`claude-3-5-haiku-20241022`, now listed by resellers only. Authorship comes\nfrom the `models//.toml` directory scan rather than a provider\nlist, so new authors need no maintenance; only `zai`, which serves models\nauthored under `models/zhipuai/`, needs an alias entry.\n\nThe name pattern is gone, and entries whose costs are all zero (flat-fee\nplans such as `kimi-for-coding`) or that price assets rather than output\ntext tokens are skipped instead.\n\nThe snapshot grows from 335 to 422 entries. No surviving entry changes\nprice; the 234 dropped keys are reseller-invented aliases and speed tiers\n(`kimi-k2.6-nitro`, `accounts/fireworks/...`, `TEE/...`) and dotted or\n`-thinking` spellings the fuzzy matcher already resolves to their base key.\n\nThe derived provider trust lists are emitted alongside the snapshot for the\nRust runtime loader, which sees only the live api.json and so cannot scan\nthe authored catalog itself.\n\n* perf(pricing): minify the embedded models.dev snapshot\n\nThe committed snapshot is indented so its regeneration diffs stay\nreviewable, and `include_str!` embedded it byte for byte, so the\nindentation shipped in every binary. At 422 entries the whitespace is\nabout 19 KiB of the 58 KiB file.\n\nStrip it in `build.rs` on the way in, the same place the LiteLLM snapshot\nis already compacted. The committed file keeps its formatting.\n\nTogether with the broader coverage this keeps the release binary flat:\n3,162,832 bytes before, 3,162,880 after, for 87 more priced models.\n\n* fix(pricing): rank models.dev catalogs when refreshing pricing online\n\nThe runtime models.dev fallback loaded providers straight out of an\n`FxHashMap`, and the first catalog to claim a model id keeps it. Which\ncatalog that was therefore depended on hash iteration order, so a reseller\ncould supply a model the authoring catalog also publishes, and the\nselection could change whenever models.dev adds or removes a provider.\n`grok-build-0.1`, for example, is served by 13 catalogs whose input rates\nrange from 0 to 1 USD/Mtok.\n\nRank the catalogs before loading, using the provider trust lists the\nsnapshot generator derives from the authored catalog, and sort by provider\nid within a tier so the result no longer depends on hash order at all.\n\nAlso skip entries whose input and output costs are both zero. Flat-fee\nsubscription catalogs publish those - `kimi-for-coding` is one, and it is\namong the 13 that serve `grok-build-0.1` - so loading one reported every\nrequest as free. The snapshot generator already skipped them; the runtime\nloader did not.\n\n* fix(pricing): keep asset-priced models out of the models.dev snapshot\n\nDropping the model-name filter let two kinds of non-token pricing into the\nsnapshot, where the runtime divides the rate by a million and multiplies it\nby token counts.\n\n`whisper-large-v3` prices per second of audio. It reached the snapshot at\n0.003 USD because the catalogs serving it advertise text output, and the\nprevious check only looked at the output side.\n\n`gemini-2.5-flash-image` and `gemini-3-pro-image-preview` price per\ngenerated image - 30 and 120 USD respectively. Google authors both with\nimage output, so the output check did reject Google's entry, but `302ai`\nlists the same models as text-only and its entry was embedded instead. A\nsloppier reseller description could therefore override the author's.\n\nRead the modalities off the authored catalog rather than the catalog being\nloaded, so one reseller's description cannot decide eligibility, and require\nthat the input modalities include text. A model that accepts no text is a\ntranscription or vision-only endpoint billed by duration; accepting audio,\nvideo, image or PDF alongside text is normal for chat models and is\ntokenised, so `kimi-k3` and `gemini-3-flash-preview`, which take video and\naudio input, stay eligible. An earlier attempt rejected any audio or video\ninput and dropped both of them.\n\nThe snapshot goes from 422 to 418 entries. The Rust test asserts both\ndirections against the committed artifact so a future regeneration cannot\nreintroduce either case.\n\n* fix(pricing): apply the snapshot's selection rules to live models.dev too\n\nThe asset-priced guard and the same-tier tie-break existed only in the\nsnapshot generator, so an online refresh could still price a model the\nembedded snapshot deliberately excludes, and could pick a different catalog\nthan the snapshot for the same model. Offline and default runs disagreed.\n\nThe live `api.json` records neither who authored a model nor the authored\nmodalities, so both have to be carried in from generation time. The\ngenerated artifact therefore grows an `assetPricedModelIds` list, and is\nrenamed from `models-dev-provider-trust.json` to\n`models-dev-catalog-rules.json` now that it carries more than provider\ntrust.\n\nThe loader applies it the same way the generator does: the authored verdict\ndecides where it exists, so a reseller describing an image model as\ntext-only cannot reintroduce a per-image rate, and entries the authored\ncatalog has never seen fall back to their own modalities, which is enough to\nreject an audio-only transcriber from any catalog.\n\nSame-tier ties now compare how much pricing detail an entry carries -\nexplicit cache-read, cache-write, context limit - before falling back to the\nprovider id, matching `shouldReplaceModelsDevPricingCandidate`. That needed\nthe loader to track which catalog claimed each id during a pass, so a better\ncandidate can replace a weaker one; ids absent from that record still belong\nto another pricing source and are left alone. Replacements do not increment\nthe loaded count, which stays a count of resolved models.\n\nReported by cubic on #1541.\n\n* style(pricing): collapse the nested modality check\n\nclippy::collapsible_if. Rewriting the two checks as slice patterns reads\nbetter than collapsing the condition and drops the redundant emptiness\ntests.\n\n* fix(pricing): keep separately priced tiers of the models we carry\n\nDropping reseller-only ids took the speed and effort tiers with them:\n`kimi-k2.6-nitro`, `kimi-k2.7-code-flex`, `glm-5.2-nitro`, `claude-opus-4-6-think`\nand about 140 others. Those are their own routes at their own rates, usually\ncheaper than the author's, so resolving them to the base model by name\nsimilarity over-reports them. `kimi-k2.6-nitro` went from 0.275 to 0.95\nUSD/Mtok - 3.5x - which is worse than the reseller duplicate this series set\nout to remove.\n\nKeep a reseller entry when its id is the authored id plus a suffix, and only\nfor bare ids: an id carrying a provider path is that provider's catalog entry\nfor a model some trusted catalog publishes anyway, which is the duplicate\ncase.\n\nA tier the author prices itself does not qualify. `claude-opus-5-fast` and\n`claude-opus-4-8-fast` exist in exactly one reseller catalog at 12 USD/Mtok\nwhile Anthropic publishes 10, so taking the reseller rate would over-report\nthem; the fast multiplier the runtime already applies is correct. The check\nreads those modes from the authoring provider's catalog entry, because\n`experimental.modes` lives in `providers//models/.toml` rather\nthan in the `models/` metadata.\n\nSnapshot 418 -> 559 entries, binary 3,162,832 -> 3,179,440 bytes (+0.5%).\n`ccusage daily --until 20260728` over a real 169-day Claude and Codex log\nstays byte-identical to main in both online and offline modes.\n\nThe broader alternative - keep every reseller id that does not reduce to an\nauthored one - was measured at 1804 entries and +136 KiB, because it drags in\nevery third-party host's copy of every open-weight model.\n\n* fix(pricing): match generation's candidate ordering in the live loader\n\nThree defects in the same-tier tie-break, all reported on #1541.\n\nThe detail comparison summed how many optional fields an entry carried, but\ngeneration compares cache-read, then cache-write, then context-limit presence\nin that order. A cache-read-only entry therefore lost online to one carrying\ncache-write and a context limit, while the committed snapshot picked the\nformer. A `ModelsDevClaim` struct with the fields declared in that order\nfixes it, because `derive(PartialOrd)` compares them in declaration order.\n\nA replacement that publishes no context limit left the replaced catalog's\nlimit in `context_limits`, reporting a window the selected rates do not\nbelong to. It is now removed, and only when the id was claimed in this pass,\nso another pricing source's limit is never touched.\n\nTwo source keys in one catalog can carry the same `id`, and the first to\narrive claimed it, which meant hash iteration order decided the winner again.\nGeneration walks each catalog in key order and keeps the first of an\nequal-strength tie, so the entries are sorted by key before loading.\n\nToday's models.dev response has no such duplicate, because `generateProviders`\nsets `id` to the source key, but nothing in the schema guarantees that.\n\n* fix(treefmt): stop typos rewriting model ids in generated snapshots\n\nOne Gemini id in the models.dev snapshot ends in a clipped \"no thinking\",\nwhich typos treats as a misspelling and corrects. The committed snapshot\ntherefore carried a model id that does not exist upstream, so that model\ncould never match and would report no cost - a silent data corruption in a\nfile nobody reads by hand.\n\nThis only surfaced now because the previous commits widened the snapshot from\nthe Claude and Kimi families to every token-priced model, which is what first\npulled a typos-sensitive id into it. CI caught it as a treefmt-check failure\non the generated file.\n\nExclude the three generated snapshots from typos alone; they stay in the JSON\nformatter, which is what keeps their regeneration diffs reviewable.\n\nThe same rewrite applies to prose, so the comment explaining this cannot\nspell the id out - it was rewritten on the first `just fmt` after being\nwritten.\n\n* fix(pricing): carry the authored catalog's verdicts into the live loader\n\nThe rules artifact listed only the models the authored catalog prices per\nasset, so the live loader could reject a model the snapshot carries: an\nauthored token-priced model whose serving catalog describes it as\nimage-output fell through to that catalog's modalities and was dropped, while\ngeneration had accepted it on the authored verdict. The asymmetry only ran one\nway, so `--offline` priced the model and a default run did not.\n\nCarry `authoredModelIds` as well. An authored id absent from the asset list is\nauthored as token-priced, which settles it whatever the serving catalog\nclaims, and only ids the authored catalog never listed still fall back to live\nmodalities.\n\nThe same artifact then closes the loader's other gap. Generation embeds a\nreseller entry only when the authored catalog knows the model or when the id\nnames a separately priced tier of one; the loader checked token pricing alone,\nso an online refresh priced 1705 ids the embedded snapshot deliberately omits,\neach at that reseller's own promotional or marked-up rate. Only the tiers an\nauthor prices itself were missing from the artifact, so with `authoredModes`\nalongside the authored id set the loader can apply\n`isEmbeddableModelsDevCandidate` too, and simulating it over the pinned catalog\nnow reproduces the committed snapshot exactly: same 559 ids, same rates. The\nartifact grows to 8.0 KB.\n\nAlso rank and tie-break catalogs by `provider.id` rather than the key they are\nfiled under, which is what `provider.id ?? providerId` gives the generator.\nmodels.dev assigns the id from the directory name today, so the two agree, but\nnothing in the schema requires it.\n\nReported by cubic on #1541.\n\n* fix(pricing): stop pruning models.dev ids and gate the fuzzy lookup instead\n\nPruning ids to keep the snapshot small was the wrong lever. `PricingMap::find`\nfalls back to substring matching that prefers the longest matching key, so\nremoving an id does not make its lookups fail - it makes them resolve to\nwhichever remaining key happens to match. Three pruning rules were tried and\neach mispriced something different, measured by pricing all 829 ids either\nside of the diff knows:\n\n- reseller ids dropped: `kimi-k2-7-code` resolved to `kimi-k2.7-code-highspeed`\n and doubled, from 4.95 to 9.90 USD for 1M+1M tokens, and about 40 Claude\n spellings such as `claude-4.5-sonnet` and `claude-3-7-sonnet-latest` went\n unpriced because the authored id is `claude-sonnet-4-5` and neither spelling\n contains the other\n- tiers marked exact-only on top of that: `moonshotai/kimi-k2.7-code-highspeed`\n then fell to the base rate instead\n- bare ids kept, namespaced ones dropped: 31 ids changed price, in both\n directions\n\nKeep every id the catalog publishes, so each resolves exactly and the fuzzy\nfallback only ever sees ids models.dev has never heard of - which is where it\nwas before this branch. The rules now decide only *which* catalog's rates an id\ngets.\n\nTwo kinds of key must still stay out of the fuzzy candidates, because they\nwould answer a lookup for a different model:\n\n- a separately priced tier: `kimi-k2.7-code-highspeed`, `kimi-k2.6-nitro`,\n `claude-opus-5-fast`\n- an id with no version in it: models.dev carries one called `auto`, which\n answered `codex-auto-review` - a Codex label that has to resolve through the\n adapter's date mapping rather than be priced directly. An existing test\n caught it\n\n`PricingMap` gains an `exact_only` set, excluded from the fuzzy scan in\n`find_entry` and `context_limit_entry`, and the snapshot marks those keys.\n\nSnapshot 335 -> 2362 entries, 476 of them exact-only. The binary grows\n3,162,832 -> 3,444,032 bytes, 8.9%. That is the price of the guarantee: across\nall 829 ids, 367 are newly priced, none lost pricing, and none changed price.\n\nTwo follow-ups the online path needed for the same reasons, folded in here\nbecause the workspace cannot author a separate commit GitHub will accept:\n\n`exactOnly` is a field this commit writes into the snapshot, and a live\n`api.json` has none, so nothing was ever added to `PricingMap::exact_only`\nonline: a refreshed run put every tier back into the fuzzy scan, where a live\n`kimi-k2.7-code-highspeed` answered `kimi-k2-7-code` and `auto` answered\n`codex-auto-review`. The loader now rederives the verdict from the rules\nartifact, asking the tier half about the catalog's source key and the\nunversioned half about the pricing key it resolves to. It also stops pruning\nreseller ids with `is_embeddable`, the rule this commit dropped from\ngeneration, which had the online refresh carrying 601 ids where the snapshot\ncarries 2362. The tier check folds `@` as `normalizeModelId` does, so the 25\nVertex regional ids such as `claude-opus-5@eu` are recognized as tiers of the\nmodel they shadow. Replaying the loader over the pinned revision's catalog now\nreproduces the committed snapshot exactly: the same 2362 ids, the same rates,\nthe same 476 exact-only keys.\n\nGeneration resolves `provider.id ?? providerId` before ranking a catalog, the\nway the loader does, so a catalog filed under an alias cannot be an owner\nonline and a reseller in the snapshot. models.dev assigns that id from the\ndirectory it scanned, so the artifacts regenerate byte for byte.\n\nCo-authored-by: Codesmith \n\nTest the two gates directly: unit tests for isUnversionedModelId in the\ngenerator, and a grok candidate test whose priced key no -build candidate\ncan reach, so it exercises the strip instead of the fuzzy lookup answering\nxai/ with a key the raw form already contains.\n\n* fix(pricing): keep the fuzzy lookup off exact-only ids\n\n`exact_only` kept a separately priced tier from answering another model's\nlookup, but not the reverse: the embedded models.dev snapshot is a\nseparate map consulted only after the primary LiteLLM one misses, so\n`claude-opus-5-fast` matched LiteLLM's `claude-opus-5` in the primary\nfuzzy scan and billed the tier at list price, 5/25 instead of 12/60. The\nsame shadowing hit the regional aliases, `claude-opus-5@eu` and friends.\n\nGate the fuzzy scan on whether a consulted catalog carries the requested\nid as exact-only, so it falls through to that exact entry instead. Only a\ncarried entry gates the scan, leaving ids nothing prices exactly on the\nfuzzy path they had.\n\nCo-authored-by: Codesmith \n\n* fix(pricing): deny the fuzzy scan when an alias names an exact-only id\n\nA `CCUSAGE_MODEL_ALIASES` entry is only tried after the map has answered\nfor the spelling the log recorded, so gating on that spelling alone left\nthe tier the alias names unreachable: `claude-opus-5-turbo` aliased to\n`claude-opus-5-fast` still fuzzy-matched LiteLLM's `claude-opus-5` and\nbilled the list rate. Carry the verdict for the resolved alias into the\nfirst lookup, in the context-limit path too. Exact entries for the\nrecorded spelling keep their precedence, and the alias, the network\ncatalog and the snapshot all still resolve fuzzily on their own terms.\n\nCo-authored-by: Codesmith \n\n* perf(pricing): deflate the embedded pricing snapshots\n\nDropping the coverage filters grew the embedded models.dev snapshot to a\nquarter megabyte of JSON, all of it shipped verbatim in every binary:\n3,162,832 bytes on main to 3,444,032, 8.9%. The JSON deflates to a ninth of\nits size, so compress all three embedded snapshots in build.rs and inflate\neach one once, on first use. The committed files stay indented for reviewable\nregeneration diffs.\n\n models-dev-pricing.json 259,174 -> 28,448 bytes\n binary 3,444,032 -> 3,179,904 (+0.5% over main)\n\nThe inflate side is miniz_oxide without default features, pure Rust; under\nthe fat-LTO opt-level=z release profile the decompressor costs a few KiB.\nInflation runs once per snapshot per process and is not measurable at\nstartup. Compression runs in build.rs at maximum effort, where its cost is\npaid only when a snapshot changes.\n\nVerifying the round-trip surfaced a pre-existing wrinkle: serde_json's\ndefault float parsing is not correctly rounded, so the minification\nintroduced in an earlier commit shifted eleven prices by one ULP on their way\ninto the binary - harmless at 1e-16 relative, but it broke the invariant that\nthe embedded data equals the committed data. The build script now enables\nserde_json's float_roundtrip feature, which is host-only and costs the\nshipped binary nothing; the inflated snapshots are byte-faithful to the\ncommitted files again.\n\nRe-verified against main across every id either snapshot knows: 367 newly\npriced, none lost, none changed. The two ids that moved in the raw probe,\nTEE/kimi-k2.5 and its -thinking sibling, no longer exist at the pinned\nmodels.dev revision, so both binaries guess through the fuzzy fallback and\ntheir guesses differ - the pre-existing unknown-id behavior, not a change in\nit. Real-log reports stay byte-identical to main in both modes.\n\n* fix(pricing): gate every separator spelling of an exact-only id\n\nmodels.dev writes a regional alias as claude-opus-5@eu, and the fuzzy scan\nreads @, . and - as one separator, so a request recording claude-opus-5-eu\npassed the raw-string exact-only gate and was billed at the base model's\nlist rate. Index exact-only ids under their normalized spelling too, and\nanswer such a request from the id it names rather than losing its rate.\n\nCo-authored-by: Codesmith \n\n* fix(pricing): index dash-spelled exact-only ids by their normalized form\n\nnormalized_pricing_key borrows a key already spelled with dashes alone, so\nthe normalized index skipped it and a request writing that id with . or @\nanswered neither membership question: the fuzzy scan then billed the base\nmodel instead of the exact-only tier.\n\nCo-authored-by: Codesmith \n\n* refactor(pricing): name the failing snapshot in build panics\n\nembed_snapshot runs for two snapshots and the LiteLLM path used the same\nmessage, so a build failure did not say which file it failed on. Reported\nby CodeRabbit on #1541.\n\n* feat(pricing): price long-context tiers from models.dev data\n\nGrok, GPT-5.x and Gemini bill requests above a context boundary at higher\nrates, and `--mode calculate` ignored that everywhere the data came from\nmodels.dev: the generator dropped `cost.tiers` on the floor, and the only\ntwo-stage rates the runtime knew were a hardcoded table for six GPT-5\nmodels. On a real Grok Build log, 94 of 172 requests exceed the 200K\nboundary and were billed at half the correct input rate.\n\nThe generator now emits each model's long-context band in the upstream\n`cost.tiers` shape, so the Rust loader parses the embedded snapshot and a\nlive `api.json` response with the same code. `Pricing` holds one above-base\nband, so the band with the lowest context threshold is kept - it is the one\na request crosses first, and the handful of models publishing a second,\nhigher band would otherwise contribute nothing.\n\nModels whose base rates come from LiteLLM get the band filled in from the\nmodels.dev snapshot after every load, replacing the hardcoded\n`builtin_long_context_rates` table. The overlay consults exact ids only\n(after date-suffix and alias resolution): a fuzzy match here could graft one\nmodel's tier onto another's base rates. `long_context_split_threshold`,\nwhich the Codex aggregation uses to bucket per-request context sizes, now\nreads the same data.\n\nDeleting the table also fixes two prices it had frozen: OpenAI cut\ngpt-5.6-terra to 2/12 USD/Mtok (tier 4/18) and gpt-5.6-luna to 0.2/1.2\n(tier 0.4/1.8) after it was written, and `put_builtin_pricing` was\noverwriting the corrected rates LiteLLM already publishes - luna reported\nat five times its price. Built-in entries are now a last resort for keys\nthe snapshots miss, never an overwrite, with one exception kept: z.ai's\nGLM cache facts (no cache-write billing, own cache-read rate) are patched\nonto entries whose snapshot did not publish cache rates, base rates\nuntouched.\n\n* fix(cost): select the long-context tier by the whole context\n\nThe two-stage branch compared only `input_tokens` against the model's\nthreshold, but adapters normalize usage into the Claude shape where that\nfield is the uncached remainder. The vendor picks the tier by the request's\nwhole context, cached or not, so a turn re-reading megabytes of cached\nprompt with a few thousand fresh tokens was billed at the short-context\nrate. Grok logs are the extreme case: prompt caching leaves days where\ncache reads outnumber fresh input fifty to one, so effectively no request\never crossed the boundary.\n\nSum uncached input, cache reads and cache writes for the comparison. The\nCodex path already compares OpenAI's raw `input_tokens`, which includes\nthe cached share, so the two paths now agree on what a request's size is.\n\nBilling itself is unchanged - each bucket still bills at its own rate -\nonly the tier selection sees the full context.\n\n* fix(grok): resolve pricing candidates exactly before falling back to fuzzy\n\n`PricingMap::find` falls back to substring matching, so once the snapshot\ncarries `grok-4.5`, the raw candidate `grok-4.5-build` fuzzy-hits it on the\nfirst iteration and every later candidate is dead code - including the\n`xai/`-prefixed spellings a user pricing override may be keyed by.\n\nTry every candidate exactly first, then repeat the walk with the fuzzy\nlookup. An override naming the request's model precisely now beats a fuzzy\nhit on a shorter spelling, and with no override the result is unchanged:\nboth passes land on the same grok-4.5 rates.\n\n* fix(pricing): merge dotted and dashed spellings onto one models.dev entry\n\nmodels.dev catalogs spell the same version with dots or dashes, and each\nspelling got its own snapshot entry from whichever catalog published it.\nThe two entries then tied in the fuzzy lookup - equal length, arbitrary\ntie-break - so `grok-4.5-build` resolved to `grok-4-5`, a reseller's flat\ncopy, instead of `grok-4.5`, xAI's tiered one, and every long-context Grok\nturn was billed at the base rate even after the tiers landed.\n\nSpellings now contend for one slot keyed by the normalized id, in the\ngenerator and in the live loader alike, and the losing spelling's entry is\nremoved outright - entry, exact-only flag and context limit - or both would\nstay findable and the tie would return. The winner also gains a comparison\nstep: within a trust tier, a catalog publishing a long-context band beats\none with more cache detail, because the band is the rate data hardest to\ncome by. Lookups by the losing spelling still resolve through the fuzzy\nnormalization, now onto the surviving entry.\n\nThe snapshot shrinks from 2363 to 2159 entries, all spelling duplicates.\n\n* docs(grok): describe long-context tier estimation\n\nThe estimate now applies xAI's long-context rates when a turn's whole\ncontext crosses the model boundary, so the guide stops claiming the tiering\nis not reproduced and states the per-turn approximation instead.\n\n* test(pricing): carry the tier flag in generator candidate fixtures\n\noxlint's type-aware pass requires the new field the runtime comparison\ngained; node --test does not type-check, so it passed without it.\n\n* fix(pricing): normalize catalog verdict lookups and stop the last overwrites\n\nReview findings from cubic on #1541, all in the new tier and selection code.\n\nThe authored catalog's verdicts - asset-priced, authored, its modalities -\nwere keyed by the exact source id, so a catalog spelling a model with\ndifferent separators or case dodged them: a reseller listing\n`gemini-2-5-flash-image` as text-only would have put its per-image rate\ninto the snapshot. The verdict maps and the rules artifact now hold\nnormalized ids, and every lookup normalizes the same way generation does,\ncase folding included; the live loader's claim slots fold case too, so\ncase-variant spellings merge online exactly as they merge offline.\n\nGeneration also disagreed with the runtime about an authored model that\npublishes no modalities: the generator fell back to the serving catalog's\ndescription while the loader kept every authored id, so a mislabeling\ncatalog could make the snapshot skip what a live refresh keeps. Authored\nids without authored modalities are now token-priced in both paths.\n\nThree built-in entries still overwrote refreshed pricing - the two\nclaude-3-5-haiku spellings and z.ai's free glm-4.5-flash - and now go\nthrough the fallback and patch helpers like the rest. The GLM cache patch\nalso repairs a defaulted cache-write on entries whose cache-read rate was\npublished: `Pricing` records only read explicitness, but the derived\ndefault is recognizable exactly, being this same computation.\n\nThe long-context sum saturates instead of wrapping, so a corrupt JSONL\nline cannot flip a request under the threshold or abort under overflow\nchecks.\n\n* fix(pricing): key empty declared ids by their source and order same-id catalogs\n\nTwo live-loader gaps against generation, reported by cubic on #1541.\n\nA live catalog can declare `id` as an empty string, and the loader stored\nthe model under \"\" - a name no lookup ever asks for - where the generator's\n`selectModelsDevPricingKey` falls back to the source key. Empty ids now\nfall back the same way, for the pricing key and for the exact-only verdict\nalike.\n\nTwo catalogs can also declare the same provider id, which tied the sort and\nleft their order to hash iteration. The unique provider map key settles the\ntie now, matching the order of generation's provider-key walk.\n\n* fix(pricing): track cache-write explicitness instead of inferring it\n\nThe z.ai cache patch recognized a defaulted cache-write by its value - it\nequals `input * 1.25` - which misreads a catalog explicitly publishing that\nsame number. The heuristic was a dodge around `Pricing` only recording\ncache-read explicitness; recording both is the honest shape, so every\nconstructor now says where its cache-write rate came from: published data\nor the derived default. The patch repairs reads and writes independently\nand only ever the derived ones.\n\nReported by cubic on #1541, and it also closes the round-3 finding this\nheuristic had answered halfway.\n\nThe Grok guide's troubleshooting note still credited LiteLLM for\n`--mode calculate` estimates; it now matches the Pricing bullet above it.\n\n* fix(pricing): break exact claim ties by source key within a declared id\n\nTwo catalogs declaring the same provider id are one provider to generation,\nwhich breaks exact-strength ties by `(sourceProviderId, sourceModelId)` -\nand with the ids colliding, by the source model key. The live loader kept\nwhichever catalog arrived first instead, so a same-strength duplicate could\nresolve to a different rate online than in the snapshot. The claim slot now\nrecords the declared id and source key it was claimed under, and an exactly\nequal claim yields to a smaller source key from the same declared id.\nDiffering declared ids were already settled by arrival order, which matches\ngeneration's ascending walk.\n\nReported by pullfrog on #1541.\n\nAlso narrows the new `cache_create_explicit` field to `pub(crate)`: nothing\noutside the crate reads it, and the hawk gate fails the build for exactly\nthat.\n\n* style(pricing): make the cache-write flag private\n\nhawk: pub(crate) was still wider than its uses, which never leave the\npricing module.\n\n---------\n\nCo-authored-by: Codesmith ","tree":"8f735a3cde72f3bfd19d398eb7ef077a38c8047a"},"mode":"0100644","name":"Cargo.toml","size":3159},{"lastCommit":{"author":{"email":"1560508+ryoppippi@users.noreply.github.com","name":"ryoppippi","when":"2026-08-15T14:26:44.000000+01:00"},"committer":{"email":"noreply@github.com","name":"GitHub","when":"2026-08-15T14:26:44.000000+01:00"},"hash":"a323dcc233e259cd2bc3500bfa3cb4ff9d9a4f6d","message":"fix(grok): hide empty cache creation column (#1605)\n\n* fix(grok): hide empty cache creation column\n\nFocused Grok reports now suppress the cache-creation column when every selected row reports zero, while retaining cache reads, totals, JSON fields, and unified report columns. The shared table renderer exposes this as an opt-in display option so future non-zero Grok records remain visible. Add focused regression coverage and document the source-specific table behavior.\n\n* test(grok): harden cache column regression\n\nRead the shared renderer default in the regression test so the test guards the public default configuration. Link the Grok guide to the JSON output documentation for the stable cacheCreationTokens schema.","tree":"e814c0c4e72a1662b2cef7fec797cf95842e748a"},"mode":"0040000","name":"adapters","size":0},{"lastCommit":{"author":{"email":"41898282+github-actions[bot]@users.noreply.github.com","name":"github-actions[bot]","when":"2026-08-18T17:33:49.000000Z"},"committer":{"email":"41898282+github-actions[bot]@users.noreply.github.com","name":"github-actions[bot]","when":"2026-08-18T17:33:49.000000Z"},"hash":"9236678f27b9db077ed15522859fb2daab6a774d","message":"chore(pricing): update models.dev snapshot\n","tree":"c6a55dfab950b82e14741669414b3805d075b355"},"mode":"0040000","name":"crates","size":0},{"lastCommit":{"author":{"email":"1560508+ryoppippi@users.noreply.github.com","name":"ryoppippi","when":"2026-07-27T12:16:43.000000+01:00"},"committer":{"email":"noreply@github.com","name":"GitHub","when":"2026-07-27T12:16:43.000000+01:00"},"hash":"86788c3a37809103eeab14a2910adf916ce663c1","message":"perf(rust): split the workspace into independently cached crates (#1428)\n\n* refactor(rust): extract shared core crate\n\nMove shared types, pricing, configuration, output, date, and block logic into ccusage-core so adapter crates can depend on an acyclic foundation. Keep the ccusage package focused on command dispatch and move Codex-owned types into its adapter boundary.\n\nCo-authored-by: ryoppippi \n\n* test(core): move snapshots with extracted modules\n\nKeep Insta snapshot ownership aligned with the new ccusage-core crate so its existing characterization tests continue to compare the same outputs.\n\nCo-authored-by: ryoppippi \n\n* refactor(adapters): extract shared adapter helpers\n\nMove JSONL parsing, file walking, date filtering, size-balanced chunking, and ordered parallel reads into ccusage-adapter-common. This removes the Claude adapter as an infrastructure dependency before agent crates are split.\n\nCo-authored-by: ryoppippi \n\n* refactor(adapters): split agents into workspace crates\n\nMove every agent adapter and the unified all-agent aggregator into dedicated ccusage-adapter-* crates. Preserve their tests and snapshots with each owning crate, keep shared infrastructure in ccusage-adapter-common, and leave ccusage as thin command wiring.\n\nCo-authored-by: ryoppippi \n\n* perf(nix): cache real adapter artifacts\n\nBuild the shared foundation and each adapter as filtered Crane cargoBuild derivations, merge their real target artifacts, and compile only the unified adapter plus thin binary at the final layers. Apply the same target-specific graph to native, musl, and Darwin cross packages.\n\nCo-authored-by: ryoppippi \n\n* fix(core): keep test-only pricing length private\n\nCo-authored-by: ryoppippi \n\n* docs(rust): route adapter work to crates\n\nUpdate repository guidance and source references for the new ccusage-adapter-* workspace layout and shared core/common boundaries.\n\nCo-authored-by: ryoppippi \n\n* fix(nix): use dependency artifacts on Darwin\n\nCrane emits full artifact archives on macOS, so merging sibling adapter archives can overwrite shared crate variants. Keep per-adapter layers on Linux and fall back to the safe dependency-only cache for native and cross Darwin packages.\n\nCo-authored-by: ryoppippi \n\n* refactor(core): own shared adapter reporting\n\nMove generic JSON row and period helpers from the OpenCode adapter into ccusage-core. Remove the resulting OpenCode dependency from leaf adapters and trim obsolete direct dependencies from the binary crate.\n\n* fix(pricing): follow extracted asset paths\n\nRegenerate, format, diff, and stage models.dev and Codex fallback snapshots at their new owning crate paths. Watch the moved config schema source in treefmt as well.\n\n* perf(nix): isolate and retain current adapter artifacts\n\nBuild independent adapters directly from the shared foundation. Root the current Linux native artifact graph and garbage-collect superseded store generations before saving that cache, preventing per-commit artifact accumulation.\n\n* refactor(adapters): keep implementation modules private\n\nExpose only each adapter's intentional command and loader surface while keeping parser, path, report, and implementation modules crate-private.\n\n* fix(core): harden date parsing against overflow and invalid offsets\n\nUse checked arithmetic in parse_digits so multi-digit inputs cannot silently overflow, and reject timezone offsets whose hours exceed 23 or minutes exceed 59.\n\nCo-authored-by: Codesmith \n\n* refactor(rust): centralize adapter reporting and prune unused deps\n\nMove print_table_for_agent into ccusage-adapter-common so goose and codebuff no longer depend on the amp crate, and update the Nix artifact layering accordingly. Remove unused hermes dependencies and drop the bundled sqlite dependency from the JSONL-only copilot, gemini, openclaw, and qwen adapters.\n\nCo-authored-by: Codesmith \n\n* refactor(claude): reuse shared parallel file reader\n\nLoad Claude usage files through ccusage_adapter_common::read_files_parallel and drop the crate-local read_usage_files_parallel duplicate, so improvements to the shared JSONL parallelism apply to Claude too.\n\nCo-authored-by: Codesmith \n\n* chore(rust): drop unused adapter deps and imports\n\nRemove the unused ccusage-terminal dependency from ccusage-adapter-all, prune ccusage-adapter-droid down to the crates it actually uses (dropping bundled sqlite, compact_str, memchr, rustc-hash, smallvec, ccusage-terminal, serde, and the insta dev-dependency), and remove the stale allow(unused_imports) plus dead common-helper imports from the Pi adapter.\n\nCo-authored-by: Codesmith \n\n* fix(report): align agent table totals and weekly labels with JSON\n\nThe shared agent usage table now counts extra_total_tokens by using row.total_tokens() per row and reading totalTokens from the computed totals for the footer, so reasoning and fallback tokens no longer under-report. It also includes row.week in the label fallback chain so --weekly rows keep their period identifiers, matching the JSON report and the core table renderer.\n\nCo-authored-by: Codesmith \n\n* perf(nix): collapse the Crane artifact layers into a linear chain\n\nThe per-adapter fan-out could not be used on Darwin at all, because Crane\ninstalls full rather than incremental archives there\n(rust-lang/rust#115982) and merging sibling full archives can overwrite\nshared path-crate artifacts with incompatible variants. macOS therefore fell\nback to the dependency-only cache and recompiled the whole workspace on\nevery build.\n\nA linear chain only ever extends the previous layer, so it needs no merging\nand works on every platform. The adapters share one layer because they are\nmutually independent: one cargoBuild with a -p per crate lets Cargo compile\nthem concurrently, so the layer costs about as much as its slowest adapter,\nwhile the fan-out added five serial Nix round-trips that each unpack and\nre-archive the dependency target directory.\n\nLinux, macOS arm64, and the cross-compiled macOS x64 build now all reuse the\nsame two layers.\n\n* perf(release): fold identical code in the Linux link\n\nSplitting the runtime into per-adapter crates costs binary size: each crate\ninstantiates the shared generic machinery for its own types and stable Rust\ncannot share those instantiations across crates, so the aarch64-darwin\nbinary grew 2,930,240 -> 3,096,896 bytes, all of it in __text. Linker\ndead-stripping recovers none of it — the duplicates are reachable code, not\ndead code — so mold's identical-code folding is the lever that applies.\n\n* perf(ci): build Nix derivations in parallel\n\nnix-quick-install-action writes the nix.conf it is given verbatim, so Nix\nkept its documented default of max-jobs = 1 and built every derivation one\nat a time — the independent flake checks as well as the artifact layers — on\n32-vCPU runners.\n\ncores stays at its default so the dependency derivation, which compiles the\nwhole third-party graph in a single build, still gets every core.\n\n* perf(nix): scope the clippy and rustfmt checks to the Rust source\n\nccusage-clippy compiles the entire workspace with --all-targets, and its\nsource was the whole repository, so a README, docs page, TypeScript file, or\nworkflow edit invalidated the most expensive check in `nix flake check`.\n\ntests.nix already had the right include list; it now lives in one place so\nthe two cannot drift.\n\n* perf(build): make the LiteLLM pricing download optional\n\nccusage-core's build script reached minreq with https-rustls, which enabled\nrustls's aws-lc-rs provider on top of the ring provider ureq already needs.\nCompiling aws-lc's C and assembly sources took longer than any other unit in\nthe dependency graph, and every workspace crate waited on it, because a build\nscript and its dependencies must be compiled and run before the crate that\nowns them is compiled.\n\nNo Nix build ever used that code path: the sandbox has no network, and every\nNix package hands the snapshot to the build through\nCCUSAGE_PRICING_JSON_PATH. The dev shell now exports the same pinned\nsnapshot, and the Windows release build — the one platform Nix cannot target\n— enables the feature to keep downloading it.\n\n* perf(adapters): finish pruning adapter imports and dependencies\n\nThe manifests and root imports still carried helpers and crates the adapters\nnever reach: sqlite stayed in 6 crates that open no database, insta in\nadapters with no snapshot test, ccusage-terminal in every adapter even though\nthey only see it through ccusage-core's re-exports, and the shared-loader\nimports were still wrapped in a module-wide unused_imports allow that hid\nwhich loaders each adapter depends on.\n\n* docs(rust): note the fetch-litellm-pricing build feature\n\n* perf(cli): split the argument parser out of ccusage-cli\n\nccusage-cli was the root of the dependency graph — ccusage-core and all 15\nadapters depend on it — and it also owned the parser, the help renderer, the\nbuild script, and the 30 KB of embedded help JSON. Touching help text\ntherefore recompiled 20 of 20 workspace units, and every crate waited on a\nbuild script before it could start.\n\nThe adapters and core only ever use the plain argument types, which stay in\nccusage-cli. The new ccusage-cli-parser owns Cli, the parser, the help\nrenderer, and the assets, and only the ccusage binary depends on it, so it\nsits outside the Crane artifact layers entirely: editing cli-help.json now\nleaves the foundation and adapter layers byte-identical (verified by\ncomparing the adapters layer derivation path before and after).\n\nThe config-merge tests move with the parser, since they assert how a parsed\ncommand line and a config file combine.\n\n* docs(rust): give every workspace crate a README\n\nThe split produced 23 crates whose boundaries are only visible in the\nmanifests. Each README now states what the crate owns, what belongs elsewhere,\nits public surface, and which Crane artifact layer it lands in — the last one\nbeing what determines how much a change to it costs. Adapter READMEs also name\nthe data source and environment variables, and link the existing `src/README.md`\nwhere one documents the record shapes.\n\n* fix(adapter-common): treat a zero chunk count as one chunk\n\nchunk_file_indexes_by_size became a cross-crate helper, and with a non-empty\nfile list and a chunk count of zero it indexed an empty vector. One chunk still\nreturns every index, which is what a caller asking for no parallelism wants.\n\nAlso corrects the build-script path in nix/rust-src.nix: the file that reads\nflake.lock is ccusage-core/build.rs.\n\n* docs(rust): derive each crate README's module list from its sources\n\nThe first pass used one template for every adapter, so READMEs listed modules\nthe crate does not have — the Claude adapter has no parser.rs or report.rs, and\nthe Codex adapter's aggregate, replay, speed, and types modules were missing.\nEach list now comes from the crate's own src directory, and the Pi default store\npath includes the sessions directory it actually reads.\n\n* docs(rust): point the skill at the split crate layout\n\nThe skill still described the Rust CLI as two crates. It now lists what each\ncrate owns, points at the per-crate READMEs for the artifact-layer cost, and\nstates the rule the amp/goose/codebuff coupling broke: adapters do not depend on\neach other, shared code goes to ccusage-adapter-common.\n\n* perf(core): move the blocks report into the binary\n\nblocks.rs and its SessionBlock, BurnRate, and Projection types had exactly one\nconsumer, the ccusage binary, but sat in ccusage-core, so 582 lines of\nbilling-block rendering recompiled every adapter whenever they changed. The two\nblock-only thresholds move with them; DEFAULT_SESSION_DURATION_HOURS stays in\ncore because the config layer defaults to it.\n\n* perf(core): extract ccusage-config from core\n\nconfig.rs and config_schema.rs were 28% of ccusage-core's source with exactly one\nconsumer, the binary, and config_schema is where `schemars` and its derive enter\nthe graph. Because core sits in the foundation artifact layer, that meant every\n`ccusage.json` field or schema change recompiled core, adapter-common, and all 15\nadapters, and every build compiled schemars before core could start.\n\n`cargo tree -p ccusage-core` no longer mentions schemars. The config-merge tests\nin ccusage-cli-parser reach the new crate as a dev-dependency.\n\n* refactor(core): let adapters name their own load-progress label\n\nprogress::UsageLoadAgent was a closed enum listing all 16 agents plus a match\nmapping each to a display string, so adding or renaming an agent meant editing\nccusage-core — the crate every adapter depends on and the one in the foundation\nartifact layer. It is now a newtype around the label, and each adapter passes its\nown, keeping the roster with the adapters. Labels are unchanged, including\npi-agent, GitHub Copilot CLI, and Gemini CLI.\n\n* perf(core): inject the pricing HTTP client from the binary\n\nureq entered ccusage-core through one 25-line function, and brought rustls, ring,\nwebpki, and about twenty more crates with it — all of which had to compile before\ncore, and therefore before adapter-common and every adapter. Core now takes the\nfetcher as a function pointer that main installs, and the ureq implementation\nlives with the binary.\n\n`cargo tree -p ccusage-core` no longer mentions ureq, rustls, ring, or webpki.\nWithout a fetcher installed a refresh reports that it is unavailable and the\nembedded snapshots are used, which is the existing --offline behaviour; the\nshipped binary installs one, verified by a live run still taking the network path.\n\n* refactor(rust): group the adapter crates and share manifest settings\n\nEach adapter manifest repeated the same package fields and dependency specs, so\nadding a crate meant copying a block and a version bump meant editing 23 files.\n`[workspace.package]` and `[workspace.dependencies]` now hold both, and each crate\nlists only what it uses — `jiff.workspace = true` rather than the four-line\nfeature spec. It also means moving a crate no longer touches its dependents,\nsince path dependencies live in one place.\n\nThe per-source adapters move to `rust/adapters/`, leaving `rust/crates`\nfor the crates that are not tied to a single source. `ccusage-adapter-common`\nlives with the adapters it serves, which also keeps the `adapters/*` member glob\nmatching in every filtered source tree a Crane layer builds from — a glob that\nmatches nothing is an error, and the foundation layer contains no other adapter.\n\n* perf(ci): stop the schema generator from pulling the adapter graph\n\ngenerate-config-schema was a second bin of the ccusage package, so building it\ncompiled every adapter even though it only calls into the config layer. It moves\nto ccusage-config, where a clean build is 3 units, and the Nix derivation starts\nfrom the foundation artifacts instead of the adapter ones.\n\nThat matters for wall clock because treefmt depends on this generator and the\npreflight job builds treefmt, and preflight gates the whole build matrix by\ndesign — so every build job was waiting on 15 adapters that the formatter never\nneeded.\n\n* perf(release): fold identical code in the macOS link too\n\nMeasured on the shipped Linux binary, mold's identical-code folding recovers\n158,720 of the 240,768 bytes the crate split costs (4,482,112 -> 4,323,392\nagainst 4,241,344 on main). ld64 has no equivalent, so the macOS binaries kept\nthe full cost; lld does, and the Nix build with it produces 3,232,928 bytes\nrather than 3,299,504.\n\nBoth macOS packages still link only /usr/lib and /System/Library dylibs, which\nthe postInstall gate enforces, and `--help` and the JSON reports are byte\nidentical to the ld64 build.\n\n* build(rust): move to 1.97.1 and configure hawk\n\nhawk lints a Cargo workspace for `pub` that the workspace itself never needs,\nwhich is exactly the surface a 24-crate split creates. It uses `rustc_private`\nand must run on the toolchain it was built against, so the pin moves to 1.97.1;\nthe dev shell picks that up from rust-toolchain.toml with no flake change.\n\nhawk.toml names the two production entry points rather than letting hawk assume\nevery binary target is shipped, so the reason each one is an entry point is\nwritten down. 1.97.1's clippy also wants a byte-string literal in\nparse_timezone_offset.\n\n* refactor(rust): narrow the visibility the crate split widened\n\nSplitting one crate into 24 turned a lot of module-private items into `pub`,\nbecause that is what crossing a crate boundary needs — but only some of them are\nactually crossed. hawk's closed-world analysis over the two production entry\npoints found 85 such declarations; this applies the 68 machine-applicable ones,\nturning `pub` into `pub(crate)` and dropping restricted modifiers that no longer\nrestrict anything.\n\n* refactor(rust): narrow the re-exports the crate split widened\n\nThe remaining hawk findings were public re-exports that no other crate reaches:\neach adapter re-exported report_from_rows even though only its own run() calls\nit, claude re-exported three path helpers used only inside itself, and codex\nre-exported two types its own parser and replay modules use. Splitting each\nstatement keeps every name visible where it is used and stops advertising it\npast the crate boundary.\n\nCli::parse had no callers at all — the binary goes through\nparse_from_with_config because it must pass a config context — so it is gone and\nits parse_from shorthand is now test-only. hawk reports no findings.\n\n* docs(rust): write down the workspace visibility rule and how to check it\n\nA 24-crate workspace needs a stated rule for `pub`, or the next crate will export\nwhatever compiles. The rust skill now says what the rule is, how `just hawk`\nchecks it, that hawk must be installed separately because it is not in nixpkgs,\nwhy the toolchain is pinned to 1.97.1, and that its findings are suggestions\nrather than a gate — it is explicitly experimental.\n\n* fix(nix): point the schema formatter at the moved generator\n\nThe schema-gen treefmt formatter still listed config_schema.rs under\nccusage-core and the generator under the ccusage package, so after both moved to\nccusage-config it never ran on the files whose changes should regenerate the\nschema. The config-schema flake check would still have caught the drift, but only\nafter a failing build instead of a formatting pass.\n\n---------\n\nCo-authored-by: Cursor Agent \nCo-authored-by: ryoppippi \nCo-authored-by: Codesmith ","tree":"6ecc56f4b9aff6d73b1c56750b102c17033d8c77"},"mode":"0100644","name":"hawk.toml","size":488},{"lastCommit":{"author":{"email":"1560508+ryoppippi@users.noreply.github.com","name":"ryoppippi","when":"2026-06-09T00:29:49.000000+01:00"},"committer":{"email":"noreply@github.com","name":"GitHub","when":"2026-06-09T00:29:49.000000+01:00"},"hash":"d876efbb3b0c345321cd306df85d3e9084bb446b","message":"chore: consolidate dev tasks behind just (#1238)\n\n* build(nix): add just to the dev shell\n\njust becomes the single task entry point for the repo, so expose its\nbinary in the pinned development shell.\n\n* chore: add just as the single task entry point\n\nIntroduce a root justfile plus per-package justfiles (apps/ccusage, docs,\nrust) imported as just modules, following the arto layout. Root recipes\naggregate the modules (build, typecheck) or own whole-repo nix jobs (fmt,\ncheck, schema) and release.\n\npnpm policy inside just: call dev-shell tools directly (cargo, tsgo, nix),\nuse `pnpm exec` for package-scoped node binaries (vitest, vitepress,\nwrangler), and delegate `pnpm run build` only where npm prepack and\nCloudflare invoke that script by name.\n\n* refactor(release): sync Rust version from bumpp state\n\nCall `cargo set-version` directly with operation.state.newVersion instead\nof shelling out to the `sync:rust-version` pnpm script via the\n$npm_package_version env var. This removes a layer of indirection and lets\nthe root package.json drop the script entirely.\n\n* chore: trim package scripts now owned by just and nix\n\nRemove scripts that are redundant or superseded:\n- root: keep only preinstall; build/typecheck/test/lint/format/release moved\n to just, sync:rust-version inlined into bump.config.ts\n- apps/ccusage: drop format/lint (treefmt + flake check own these), the\n test cluster (run via just), prerelease (folded into the release recipe),\n and the unused stage:native-package wrapper (CI calls the script directly)\n- docs: drop format/lint plus typecheck/preview/deploy (just calls the\n tools directly); keep build/dev since wrangler invokes pnpm run build\n\n* ci: drive checks through just\n\nReplace the direct pnpm script invocations with the just recipes\n(`just typecheck`, `just test`, `just test-vitest`), which now own the\nfan-out and run inside the dev shell.\n\n* docs: point contributor commands at just\n\nUpdate AGENTS.md, CONTRIBUTING, the package READMEs, the installation guide,\nand the repo-local skills to use `just fmt|typecheck|test` and the\n`just ::` form instead of the removed pnpm scripts.\n\n* fix(release): restore only tracked package.json after bump\n\nFeed git's own tracked file list into the post-bump checkout instead of a\nshell glob. `git ls-files '*package.json'` enumerates only version-managed\npackage.json files, so node_modules copies can never be matched, and the\nshell no longer decides what the glob expands to.","tree":"8b4cade45bf56b56ca1de2a8ddfbbac9342e7734"},"mode":"0100644","name":"justfile","size":377}],"lastCommit":{"author":{"email":"41898282+github-actions[bot]@users.noreply.github.com","name":"github-actions[bot]","when":"2026-08-18T17:33:49.000000Z"},"committer":{"email":"41898282+github-actions[bot]@users.noreply.github.com","name":"github-actions[bot]","when":"2026-08-18T17:33:49.000000Z"},"hash":"9236678f27b9db077ed15522859fb2daab6a774d","message":"chore(pricing): update models.dev snapshot\n","tree":"c6a55dfab950b82e14741669414b3805d075b355"}}