After agreeing to a deal with San Francisco during spring training that allowed him to opt out after one season, the Giants third baseman agreed Wednesday to a six-year, $151-million US contract for 2025-30.