Left-handed reliever Javier Lopez has agreed to an $8.5 million, two-year contract to stay with the San Francisco Giants, who also have picked up the $5 million contract option for fellow lefty reliever Jeremy Affeldt.