[ai-agents] Fix MCP tool field mapping by glharper · Pull Request #8038 · Azure/azure-dev

glharper · 2026-05-04T20:20:38Z

Summary

Preserves MCP routing fields when azd ai agent init and toolbox provisioning process MCP tool manifests. Top-level MCP url now maps to the API server_url, connection.name is preserved as the project connection id, and toolbox tools are enriched from the full configured connection set before being sent to the Foundry Toolsets API.

Details

Treat kind: foundry MCP connections as the existing remote connection shape instead of introducing a duplicate type.
Preserve explicit MCP url during YAML-to-API conversion.
Preserve named MCP connections as project_connection_id during YAML-to-API conversion.
Enrich toolbox tools from both connections and toolConnections when filling server_url and server_label.
Add regression coverage for sample-style MCP manifests and generic toolbox connection enrichment.

Validation

go test ./... -count=1

Copilot

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

This PR updates MCP YAML-to-API conversion for azd ai agent init so sample-style MCP manifests keep their routing metadata when converted, especially for Foundry-backed connections.

Changes:

Add foundry as a recognized connection kind with a typed FoundryConnection parser shape.
Map top-level MCP url to API ServerURL and derive ProjectConnectionID from named MCP connections.
Add regression coverage for sample-style MCP manifests, including fallback from serverName to the tool name.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.

File	Description
`cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/yaml.go`	Adds the new MCP/connection fields needed to represent sample-style Foundry manifests.
`cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/parse.go`	Extends connection parsing to recognize `foundry` connections.
`cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/map.go`	Updates MCP tool mapping to preserve server label, server URL, and project connection ID.
`cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/map_test.go`	Adds a regression test for the new MCP manifest mapping behavior.

github-actions · 2026-05-04T20:30:14Z

📋 Prioritization Note

Thanks for the contribution! The linked issue isn't in the current milestone yet.
Review may take a bit longer — reach out to @rajeshkamal5050 or @kristenwomack if you'd like to discuss prioritization.

glharper · 2026-05-04T20:46:00Z

@copilot apply changes based on the comments in this thread

…ack for ServerURL Agent-Logs-Url: https://github.com/Azure/azure-dev/sessions/63d4b8ea-3699-4818-a5f8-58a92efac573 Co-authored-by: glharper <64209257+glharper@users.noreply.github.com>

Copilot · 2026-05-04T20:51:17Z

@copilot apply changes based on the comments in this thread

Done in c1233a7:

McpTool.Url → McpTool.URL (yaml.go) — follows Go initialism conventions, consistent with ServerURL.
FoundryConnection.Endpoint fallback (map.go) — added endpointFromMcpConnection helper; when ServerURL is still empty after consulting tool.URL and options.serverUrl, it falls back to the FoundryConnection.Endpoint value.
Regression test (map_test.go) — TestConvertYamlToolToApiTool_MCPFoundryConnectionEndpointFallback covers the connection.endpoint-only case.

jongio

Clean, focused fix. The data flow through ExtractToolsDefinitions -> ExtractConnectionDefinition -> convertYamlToolToApiTool is correct, and the precedence (top-level url sets initial value, options["serverUrl"] can override) is the right call.

One inline comment on naming. The bot's Url -> URL point is valid - the rest of the API layer uses ServerURL, BaseURL, etc.

wbreza · 2026-05-04T21:23:02Z

Re-Review — PR #8038 (commit `c1233a7`)

Recommendation: Approve ✅

All substantive feedback from the first review has been addressed. The Url to URL naming fix, serverName precedence test, and FoundryConnection endpoint fallback logic all look correct.

Remaining nitpick: Test assertion at ~line 552 should print actual value for consistency.

Ship it. 👍

jongio

Incremental review of commits since my last look: both findings addressed. Url renamed to URL, and FoundryConnection removed in favor of reusing RemoteConnection (cleaner). The ServerLabel fallback logic moved to runtime enrichment in enrichToolboxFromConnections, which is the right layer for it. No new issues.

glharper · 2026-05-06T20:09:33Z

@copilot resolve the merge conflicts in this pull request

…s-mcp-tool-fields Co-authored-by: glharper <64209257+glharper@users.noreply.github.com>

Copilot · 2026-05-06T20:16:41Z

@copilot resolve the merge conflicts in this pull request

Merged origin/main into the branch in 4b31b68. The two modify/delete conflicts (testdata/mcp-tools-agent.yaml and tests/samples/githubMcpAgent/agent.yaml) were resolved by accepting the deletions from main (both removed in #8040). All tests pass.

glharper · 2026-05-07T17:34:23Z

/check-enforcer override

* Fix MCP tool field mapping * Fix McpTool.Url field naming and add FoundryConnection.Endpoint fallback for ServerURL Agent-Logs-Url: https://github.com/Azure/azure-dev/sessions/63d4b8ea-3699-4818-a5f8-58a92efac573 Co-authored-by: glharper <64209257+glharper@users.noreply.github.com> * Address MCP connection enrichment feedback * remove ConnectionKindFoundry --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: therealjohn <1501196+therealjohn@users.noreply.github.com>

Fix MCP tool field mapping

61fa642

Copilot AI review requested due to automatic review settings May 4, 2026 20:20

glharper requested review from JeffreyCA, hemarina, jongio, rajeshkamal5050, tg-msft, therealjohn, trangevi, trrwilson, vhvb1989, wbreza and weikanglim as code owners May 4, 2026 20:20

microsoft-github-policy-service Bot assigned glharper May 4, 2026

Copilot AI reviewed May 4, 2026

View reviewed changes

Comment thread cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/map.go

Comment thread cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/yaml.go Outdated

Copilot started reviewing on behalf of glharper May 4, 2026 20:35 View session

Copilot started work on behalf of glharper May 4, 2026 20:46 View session

Fix McpTool.Url field naming and add FoundryConnection.Endpoint fallb…

c1233a7

…ack for ServerURL Agent-Logs-Url: https://github.com/Azure/azure-dev/sessions/63d4b8ea-3699-4818-a5f8-58a92efac573 Co-authored-by: glharper <64209257+glharper@users.noreply.github.com>

Copilot finished work on behalf of glharper May 4, 2026 20:51

jongio reviewed May 4, 2026

View reviewed changes

Comment thread cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/yaml.go Outdated

trangevi requested changes May 4, 2026

View reviewed changes

Comment thread cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/yaml.go Outdated

Comment thread cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/map.go Outdated

wbreza approved these changes May 4, 2026

View reviewed changes

glharper added 2 commits May 4, 2026 20:04

Merge branch 'main' into glharper/fix-ai-agents-mcp-tool-fields

a929805

Address MCP connection enrichment feedback

8b085ae

glharper changed the title ~~Fix MCP tool field mapping for ai agents~~ [ai-agents] Fix MCP tool field mapping for ai agents May 5, 2026

glharper changed the title ~~[ai-agents] Fix MCP tool field mapping for ai agents~~ [ai-agents] Fix MCP tool field mapping May 5, 2026

jongio reviewed May 6, 2026

View reviewed changes

trangevi reviewed May 6, 2026

View reviewed changes

Comment thread cli/azd/extensions/azure.ai.agents/internal/pkg/agents/agent_yaml/parse.go Outdated

remove ConnectionKindFoundry

4d47c95

Copilot started work on behalf of glharper May 6, 2026 20:09 View session

Merge remote-tracking branch 'origin/main' into glharper/fix-ai-agent…

4b31b68

…s-mcp-tool-fields Co-authored-by: glharper <64209257+glharper@users.noreply.github.com>

Copilot finished work on behalf of glharper May 6, 2026 20:17

trangevi approved these changes May 6, 2026

View reviewed changes

trangevi enabled auto-merge (squash) May 6, 2026 23:24

trangevi merged commit b43e5a6 into main May 7, 2026
21 of 22 checks passed

Copilot AI mentioned this pull request May 7, 2026

Prepare azure.ai.agents 0.1.31-preview patch release metadata #8098

Merged

Uh oh!

Conversation

glharper commented May 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Details

Validation

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented May 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📋 Prioritization Note

Uh oh!

glharper commented May 4, 2026

Uh oh!

Copilot AI commented May 4, 2026

Uh oh!

jongio left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

wbreza commented May 4, 2026

Re-Review — PR #8038 (commit c1233a7)

Uh oh!

jongio left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

glharper commented May 6, 2026

Uh oh!

Copilot AI commented May 6, 2026

Uh oh!

glharper commented May 7, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

glharper commented May 4, 2026 •

edited

Loading

github-actions Bot commented May 4, 2026 •

edited

Loading

Re-Review — PR #8038 (commit `c1233a7`)