Why is the image cropped so that you almost show the section in a readable way?!?
Let's see it clearly...
...the thrust of the bar [m.6] is to B(natural)...
I don't think it's splitting hairs to say the thrust of the bar is not a particular accidentally inflected pitch, but a modulation to the dominant which is achieved through accidentals. The difference matters, because it has bearing on how to play the ornaments.
In order to see the modulation, we need to do a harmonic analysis, and to do that we need to cut through the complexities of the non-chord tones, especially the
F3 held in the bass between mm. 5-6. Here is my analysis, which mostly erases the non-chord tones, and replaces the held
F3 with an earlier arrival of the
E3 which the
F3 eventually resolves to...
After beat 1 of m. 5 though to the cadence at m. 8 the music has moved to
The use of accidentals is very, very clear in that passage. You are now in
So, how to play the ornaments on
A3 in m. 6 and
A4 in m. 8? Play them in
A minor. The upper tone will be
There is no editorial comment in the score to do this, because the accidentals make it clear to play in