Sync main → develop (resolve conflicts)#295

alocay merged 25 commits intodevelopapollographql/apollo-mcp-server:developfrom

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