I think that they need to change the NPC behavior to just stand still after a fight. I’ve had companions do some really dumb things while trying to reconvene after a fight.