persisting hitch and removing update_terminal_cwd