Are you using multiple agents on the same project? If you are, use git worktrees.

I personally prefer 3-4 concurrent terminal sessions, working on different projects. Claude code usually runs around everywhere with agents, and sometimes takes 20 minutes to get shit done. During that time I'm shipping open source work, etc.

I use my own tools to help: Sugar and RemembrallMCP. Sugar is used for memory that's stored outside sessions. So I say store this in sugar memory. If I open a new claude session later, and ask it to lookup sugar memory, it's there.

RemembrallMCP is a AST and code graph that helps the agents understand change impact of your codebase. Instead of insane greps veritical and horizontal, it uses this to quickly understand impact with very high accuracy, time reduction and low token limits.

Game changers.