Ending a summer-long stalemate, restricted free agent Jonathan Kuminga has agreed to a two-year, $48.5 million deal to return to the Golden State Warriors, agent Aaron Turner of Verus Basketball told ESPN.

The deal includes a team option in the second year that is designed for the Warriors — or another team if and when Kuminga is traded during the upcoming season — to rip up and complete a fresh new contract after the 2025-26 campaign, sources said.

Ahead of Wednesday’s qualifying offer deadline, Kuminga chose the two-year deal over a proposal of three years and $75 million so he can maintain a higher level of control over his immediate Warriors future. The Warriors never wavered on their team option frameworks during negotiations. Now, both sides understand the likelihood of exploring trades when Kuminga is eligible to be moved in mid-January. As part of the deal, he is waiving his inherent no-trade clause.

Kuminga missed media day Monday and the first day of Warriors practice on Tuesday as the sides finalized a deal.

Warriors general manager Mike Dunleavy Jr. and Kuminga’s side have been locked in a stalemate throughout the offseason over the framework of the contract, but Golden State ultimately increased its two-year offer by a total of $8 million between July and September and guaranteed Kuminga approximate $15 more than his one-year, $8 million qualifying offer would have for this season.

Over the last two months, the Warriors have had a standing offer of two years and $45 million with a team option, and earlier this month offered a three-year, $75 million contract with a team option and a three-year, $54 million fully guaranteed deal. Kuminga and his side wanted a player option throughout the negotiations, or a higher annual salary with a team option, requests that went denied by the Warriors.

Choosing the two-year structure allows Kuminga to create a decision for whichever team he is on next summer, or get to 2027 unrestricted free agency.