Trump’s new national-security plan beats Biden’s but muddles our biggest threats