AGENT-824: SAPI-fy cn-agent