Filter disabled tools from tools/list discovery#3591
Merged
Conversation
souvikghosh04
changed the title
souvikghosh04
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adds configuration-aware filtering for MCP tools/list responses so disabled DML tools are not advertised to clients.
Changes:
- Adds
IMcpTool.IsEnabled(RuntimeConfig)and implements it for built-in and custom MCP tools. - Adds
McpToolRegistry.GetEnabledTools(RuntimeConfig)and uses it in HTTP and stdio list handlers. - Adds unit coverage for registry filtering and built-in tool enablement checks.
Reviewed changes
Copilot reviewed 15 out of 15 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
src/Azure.DataApiBuilder.Mcp/Model/IMcpTool.cs |
Adds the enablement contract for MCP tools. |
src/Azure.DataApiBuilder.Mcp/Core/McpToolRegistry.cs |
Adds filtering of registered tools by runtime config. |
src/Azure.DataApiBuilder.Mcp/Core/McpServerConfiguration.cs |
Uses enabled-tool filtering for HTTP tools/list. |
src/Azure.DataApiBuilder.Mcp/Core/McpStdioServer.cs |
Uses enabled-tool filtering for stdio tools/list. |
src/Azure.DataApiBuilder.Mcp/Core/DynamicCustomTool.cs |
Marks dynamic custom tools as always enabled. |
src/Azure.DataApiBuilder.Mcp/BuiltInTools/*.cs |
Adds per-tool DML config checks for built-in tools. |
src/Service.Tests/Mcp/McpToolRegistryTests.cs |
Adds filtering and built-in enablement tests. |
src/Service.Tests/Mcp/McpQueryTimeoutTests.cs |
Updates test tools for the new interface method. |
src/Service.Tests/UnitTests/McpTelemetryTests.cs |
Updates mock tool for the new interface method. |
Address review: use ?? true instead of == true so tools default to enabled when runtime.mcp or dml-tools is not configured. Add test for null Mcp config case.
souvikghosh04
requested review from
Alekhya-Polavarapu,
Aniruddh25,
JerryNixon,
RubenCerna2079,
aaronburtle,
anushakolan,
rusamant,
sourabh1007,
stuartpa and
vadeveka
as code owners
Aniruddh25
reviewed
May 18, 2026
Aniruddh25
reviewed
May 18, 2026
Aniruddh25
approved these changes
May 18, 2026
Aniruddh25
approved these changes
May 19, 2026
github-project-automation
Bot
moved this from Review In Progress
to Done
in Data API builder
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Internally, all tools respects the enabled/disabled config flag. However, discovery was still made. Disabled tools were still returned in
tools/listMCP responses. This fix filters them out at the listing level.Changes
IsEnabled(RuntimeConfig)toIMcpToolinterfaceDynamicCustomTool(always enabled)GetEnabledTools(RuntimeConfig)toMcpToolRegistrytools/listhandlers to useGetEnabledToolswith fail-fast (no silent fallback to unfiltered list)IsEnabledbehaviorBehavior
Before:
tools/listreturned all registered tools regardless ofdml-toolsconfig flags. Setting"delete-record": falseor"create-record": falsehad zero effect — disabled tools still appeared in the tool list and were callable.After:
tools/listonly returns tools whereIsEnabled(RuntimeConfig)is true. Disabled DML tools no longer appear in the response. Both HTTP (Streamable) and stdio transports are covered.