4a82c014bb
Brings main in so the branch has one merge base with it (GitHub saw a conflict through the criss-cross bases; the merge itself is clean). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>