So long as people have food, shelter and useless distractions, there won't be large scale revolution. Look at history, USSR, PRC, French Revolution, all were due to popular unrest stemming from the inability of government to meet basic human needs.
The American revolution and much of South America - was the result of landed gentry wanting to directly control their trade laws. The equivalent today would be massive corporations hiring lobbyists and mercenaries to manipulate governments.
Providing water and food is all that we need to figure out - transportation is already pretty solved. Even if we ran out of oil tomorrow - we won't - electric battery performance and cost + solar is nearing the point where it could be the primary support for global commerce in 10-20 years time.
A lot of "doomers" like to foment theories of collapse as if it would be a sudden event. Just like technological progress, it's a process not an event. Look at the US' sagging infrastructure - the US Highway Trust Fund is about to run dry and there is no replacement planned. We'll dip into a period of decay but it won't end civilization - it will just lower the safety of Americans to below third world standards.
It's a small risk factor but it's not going to bring the world to a grinding halt. Poor leaders might cling to power for extended periods, but their incompetence can't stop hundreds of millions of researchers and engineers from advancing technological capabilities.
The bottom line, I'm more afraid of dumb politicians with dumb killer robots than emotional computers that help us solve engineering problems. The utility value of 100 trillion digital minds thriving across the solar system is greatly higher than struggling to support living conditions for 10 billion angry starving meatbags. That is going to be the true narrative of the 21st century - pastoral politicians and unstoppable job loss are going to be just tiny clinks in the pond when looking back from 2100.