Sync main → develop (resolve conflicts)#364

esilverm merged 10 commits intodevelopapollographql/apollo-mcp-server:developfrom

conflict/main-into-develop-pr-356apollographql/apollo-mcp-server:conflict/main-into-develop-pr-356Copy head branch name to clipboard