Kole Calhoun and the Diamondbacks are in agreement on a two-year, $16 million deal with a third-year team option for $9 million.