refactoring agent for the warden-cpi merge in