ClientAgent: Update channel assignment logic