dfa48239

By: Michael Lynch <git@mtlynch.io>

Merge master into file-id

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>