Merge github/main into peyton/cumulative-token-sources

Reconciles with #2820: the Droid source reads main's readSessionSettings and counts calls from assistant messages; a ledger session nests its Workers under SubagentTokens.