aider.
Because it seems to edit really well, understand context and commits each change using git, making rollbacks trivial.
Also I just like using command line as a context for interacting with AI, it creates a hard divide between the AI and the editor.
