The Golden State Warriors have agreed to a contract extension with shooting guard Klay Thompson, the team announced.