I have run in to the same thing. Most recently I told my pi-agent to fork a git repo since our work had morphed into two different tasks that shouldn't be packed into the same context and workflow. Git fork is what I will use as a tool for this division in the future.