fix: lifecycle-safety follow-ups (#2870)#2900

max-sixty wants to merge 4 commits into

mainmax-sixty/worktrunk:mainfrom

agent-a3bad31af2bb71c8emax-sixty/worktrunk:agent-a3bad31af2bb71c8eCopy head branch name to clipboard