addFromBestiary and addFromPlayerCharacter rename existing combatants before adding the new one. If the add fails, the renames were applied without an undo entry. Restore the pre-operation snapshot on failure. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>