v0.31.0-fork.1 Mostly upstream's changes

But uhh while upstream lost Claude subscription support, this light fork
hasn't B)

I also pulled in and lightly adapted a sizeable prompt refactor to test
drive. If I don't like it, there'll probably be a .2 reverting it :P
-----BEGIN SSH SIGNATURE-----
U1NIU0lHAAAAAQAAAEoAAAAac2stc3NoLWVkMjU1MTlAb3BlbnNzaC5jb20AAAAgFhbSln
9jcsTCiLgfQNQnfLwx6HkJonoGDwu1P2eRk9EAAAAEc3NoOgAAAANnaXQAAAAAAAAABnNo
YTUxMgAAAGcAAAAac2stc3NoLWVkMjU1MTlAb3BlbnNzaC5jb20AAABAujbR+pb8IH6zyK
N+xeAc47tZ4FWSTXDOzL2jBqCijPsIDJpr5qbyOkoHTEkXQfPqA3k98wc1WoppM9EYQHTX
DgEAAE7/
-----END SSH SIGNATURE-----