Since adding https://github.com/raine/git-surgeon to my workflow and installing the skill, my LLM agents haven't felt the need for anything more.