agent: RPC client should use map to the same semantics as the agent