Matt Chapman, who is putting up solid numbers in his first season with the Giants, will be staying in San Francisco long term.

The third baseman agreed to a six-year, $151 million contract extension with the team on Wednesday.

Starting next year, Chapman, 31, will make $25 million annually through 2030, with a $1 million signing bonus to be paid in 2025.

Chapman joined the Giants as a free agent in March. He is making $18 million this year and had player options for $17 million in 2025 and $18 million in 2026, then a mutual option for $20 million in 2027. The new pact negates all of those option years.

Known more for his fielding than his hitting, Chapman is a four-time Gold Glove winner who was an All-Star in 2019.

This year, he is batting .247 with a .333 on-base percentage, a .445 slugging percentage, 22 homers and 69 RBIs in 136 games. Chapman is in the midst of a hot streak, hitting .346 (9-for-26) with two homers and six RBIs in his past seven games.

He was scratched from the lineup on Wednesday for a rest as the Giants lost 6-4 to the visiting Arizona Diamondbacks.

Chapman broke into the majors with the A’s in 2017 and remained in Oakland through 2021. He was traded to the Blue Jays before the 2022 season and spent two seasons in Toronto before signing with San Francisco.

The Giants (68-72) were on the fringes of wild-card contention before losing six of their past seven games, leaving them 8 1/2 games behind the final National League wild-card position.