fork of prime agent with changes i want but are not upstreamable probqbly (and some fixes)

Merge branch 'host-safety' into integration/audit-fixes master


+297 -16
5 changed files