right now the logic is duplicated i think except for the watchman wait so i think it would be good to converge those two code paths