Found a bug where I ended up stuck in endless combat. It's the Bairdotr fight. She chose to rejoin that jerk, but during the battle, she kept teleporting around. Eventually she teleported off the map into an area of total darkness.
She not only stopped fighting (she just passed on every turn) but now that all her friends are dead, I am stuck in combat with no way to get out. Bairdotr is just stranded out in the darkness. Not sure what all the teleporting was - it was a spell effect with a green glow. Not sure who was doing it - if it was her or her friend. She doesn't have such a skill, as far as I can tell.
Note: I passed on my other party members turns seven or eight times, and she just refuses to re-engage in combat with me.