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

Merge branch 'harness-hygiene' into integration/audit-fixes master