introduce dirbased state for remote SCMs
fix the comment