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

Merge branch 'hostsafety-v2' into integration/audit-fixes master


+590 -58
3 changed files