Merging staging brought back, through its own re-apply of #32, the TOKENS campaign mapping, its test and the token_used sort fallback thatc988a79had removed, because those hunks did not conflict. This restores the five files toc988a79. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>