Merge origin/main into peyton/keep-session-with-pending-tokens

main

Commit

peyton-alt2w ago

Co-Authored-By: Claude Opus 5.5 noreply@anthropic.com Entire-Checkpoint: 01M5D9TCHP7FY0JT1WRNRH8YB5