Bush, GOP rebels agree on detainee bill