cmdiag: initial commit