The legislation codifies President Trump’s agenda but includes a few measures challenging his policies and insisting on more consultation with Congress.