The question is almost never an either/or(as the Hegelian crazies would have you believe), it's a question of how bad the problem is, where to draw the line and who's going to pay.
There was once a time when almost everyone had to be involved in food production for everyone to eat. Now it is less than 1% of the people. Today almost everyone creates wealth...
More wealth will bring higher demand for high quality, sustainably grown/raised food(and low skill jobs). My Japanese wife refuses to eat American eggs because they taste so terrible.
Mostly a machines job. Agriculture will not go back to employing a lot of people as if would make food too expensive to buy.
Could be more people though. America's(subsidized) addiction to mass produced corn and wheat products is not sustainable long term. Even the beef eat corn, it's awful.
The US is very protectionist over agriculture, but most nations are. Agriculture is the last thing to globalise. Nations still want food security is globalism breaks down.
