feat(1340): choose plan or plan+apply by button, and offer it on a drifted run (#1342)