The San Francisco Giants' upgraded rotation is taking shape, with the 2014 World Series champions agreeing Monday with Johnny Cueto on a $130 million, six-year contract.

Cueto is set to join a rotation led by Madison Bumgarner and new addition Jeff Samardzija, who was introduced Friday after formalizing his $90 million, five-year contract.

"Johnny has always been, and rightly so, very high on our list … high on our short list," Giants General Manager Bobby Evans said. "He's somebody we've admired for a long time."

Cueto's deal was pending a physical, the team said, and contains a team option for 2022. Under the agreement, he can opt out after the 2017 season and become a free agent again. He is due to earn $46 million before the opt out. If he exercises that clause, he would hit the market one year before the 2018 free-agent class, which could include Clayton Kershaw, Dallas Keuchel, Matt Harvey, Jose Fernandez and David Price.

A 29-year-old righthander, Cueto went 11-13 with a 3.44 ERA in 32 starts for Cincinnati and Kansas City, which acquired him in a July trade. He was 7-6 with a 2.62 ERA with the Reds, the only team he had pitched for until the trade, but went only 4-7 with a 4.76 ERA for the champion Royals in the regular season, posting a 9.57 ERA during one five-game stretch.

He bounced back to go 2-1 in the postseason, pitching a two-hitter against the Mets in Game 2 of the World Series.

Cueto turned down a $120 million, six-year deal from Arizona last month.

Etc.

• Cuban-born Yasiel Puig and Jose Abreu will be among the major leaguers making a four-day goodwill trip to the island starting Tuesday, along with other stars such as Miguel Cabrera, Clayton Kershaw and Nelson Cruz. Players' union adviser Dave Winfield and MLB executive Joe Torre will join the league's first visit to Cuba since the Baltimore Orioles played an exhibition game in 1999.

• All-Star reliever Darren O'Day signed a $31 million, four-year contract to stay with Baltimore. The 33-year-old submarining righthander went 6-2 with six saves and a 1.52 ERA in 68 games in 2015.

• Steve Cishek finalized a $10 million, two-year contract with Seattle, which is intending to make him the closer. The 29-year-old had 72 saves in 2013 and '14 with Miami but struggled in 2015 before the Marlins dealt him to St. Louis.

• Trevor Cahill and the Cubs finalized a $4.25 million, one-year deal, one that allows him to earn an additional $7.5 million based on starts or $700,000 based on relief appearances.