SAN DIEGO -- The San Francisco Giants have activated left-handed reliever Jeremy Affeldt from the 15-day disabled list and optioned Josh Osich to Triple-A Sacramento.