[upsteam] Prefer agi passed args over cli args.