On the floor of the Senate a short while ago, Dianne Feinstein and Ron Wyden introduced the Lawful Interrogation and Detention Act of 2009.
In addition to the egregious DiFi and Jay Rockefeller, the bill is co-sponsored by Ron Wyden and Sheldon Whitehouse, so there's hope that it's actually a good bill.