That is pretty much the workaround to get things such as hag's attribute boost w/o breaking the oath. If your party started the fight via a sneak action, you better stay on heals and don't finish any enemies.