chore(agent-v2): sync changes (#38513)