Agent push + collision fix