fix/1966-mirror-waits-token
main
Claude-Session: https://claude.ai/code/session_01JG73KEq4zoDfM9WtYpcQgZ