My trick is - ask for a plan. Revise the plan. Then ask only to work on a single step of the plan making progress incremental then ask for tests for that step and keep hitch hiking in incremental steps.
After getting lazy and relying on it too much and getting burned. I now try use it as a replacement for typing I have a similar workflow to you. I just go through the plan together, and review what’s happened every few steps and the correct. It’s actually made me a better PR reviewer, I’ve noticed :)
Yes and this also helps to highlight which problems I should be solving and which problems Claude code can solve. Like tbh building efficient data structures is not Claude’s thing he seems happy to just hack together some nonsense that leads to spaghetti being shot into all corners of your repo. But by iteratively building up plans and todo lists i find Claude is able to resist the temptation to hack everything all at once to solve the immediate problem in front of his face.