agent: re-order validation switch statements