I've made it to Tai Po and killed all the enemies in the warehouse, but the combat didn't end. When I end my turn, it cycles through two "neutral" turns, even though there's nobody else on the map. I know Krait was supposed to show up at some point, so I'm wondering if that failed to trigger, but I don't know how far back I need to go to try again. Does she enter before, after, or at the same time as the two additional spider drones? And has anyone else had this problem?

I have several saves from throughout that fight (I'm a perfectionist, so I savescum to get the optimal results), but I was hoping to not to have to replay the entire thing.

I don't know what glitches you're referring to, so I'm guessing the answer is probably no. I blew up one of the spiders instead of hijacking control of. I did have two spirits under my control -- one that Gobbet summoned herself and one that she stole from the enemy enchanter. The first disappeared after one round, the second I lost and then regained control of, and dismissed at the end of the fight. I wondered if those might be the two neutral parties in question.

Huh. Regaining control sounds like the most likely reason for this bug to occur: it could mess with the script responsible for counting enemies and sending in more meat (more than a few scripts in battles largely revolve around number of combatants and as such may break in some edge cases). Still, it all is nothing but speculations at this point: I'd suggest trying from the save before the spirit broke away. Should you feel particularly paranoid, you also can disband some of your spirits before even taking turn as them.

+1

Definitely co-opting enemies (through magic) to make them either non-hostile or join friendly forces does often mess with the scripts that trigger when a battle ends. Seen it many times.