Interesting. This is news to me. I had to kill her to end the fight, even in the lair. She's never offered to surrender.
You have to reduce her to below 10 HP and then let her take her turn. It almost feels like a secret interaction to be honest – if you're focusing her down, you're not going to stop while she's on low HP, so you need to get really lucky with turn order.
Thanks for the info. I had not stumbled into that scenario as yet.
As an addendum to the whole hag fight situation, when she disguises herself as Mayrina, I have tried a few things to get around this like taking a non-lethal attack, which, I invariably hit the real Mayrina and knock her out but then can continue with the fight. This seems to result in the same thing as if you had just killed Mayrina which seems buggy to me.