Civility is manners, politeness, saying “please” and “thank you.” It greases the wheels of social interactions, or so it is claimed to do.
Diplomacy is tactful and far more difficult and nuanced than mere civility. Diplomacy is empathetic whereas civility is rules-based and mechanical.