The feat/core-extraction branch needs #1078's fixes re-ported: pricing is centralized at packages/cli/src/pricing-pass.ts (~line 26: outputForCost = outputTokens + reasoningTokens, no provider carve-out) and packages/core's codex decode still computes totals with reasoning added. Port as a per-provider predicate (billableOutputTokens with the claude+codex inclusive set from main's src/models.ts) at the pricing-pass seam, plus the cache_write_input_tokens read + explicit-rate guard in the core codex decoder, plus the codex parse-version and cache bumps in the branch's own ladder (branch daily-cache is at 26). Without this the final branch→main merge would revert the fix.
The feat/core-extraction branch needs #1078's fixes re-ported: pricing is centralized at packages/cli/src/pricing-pass.ts (~line 26: outputForCost = outputTokens + reasoningTokens, no provider carve-out) and packages/core's codex decode still computes totals with reasoning added. Port as a per-provider predicate (billableOutputTokens with the claude+codex inclusive set from main's src/models.ts) at the pricing-pass seam, plus the cache_write_input_tokens read + explicit-rate guard in the core codex decoder, plus the codex parse-version and cache bumps in the branch's own ladder (branch daily-cache is at 26). Without this the final branch→main merge would revert the fix.