I managed this (and still do) just fine by using source control. Commits are checkpoints and it's trivial (esp. with AI-assisted CLI) to roll things back if needed. Workflow is all about small diffs, with sessions being fine-grained, not about implementing entire features wholesale. Serialize overall plans for feature work as files in the codebase in the interim.