In my team we have strict rules for scope creep in pull request. Each one needs to introduce a single thing, not a dozen little refactorings. This helps, but not when you're working alone in a personal project. Maybe you can setup your review agent to help with scope creep?