fix: MCP tool auto-approval fails when fetchToolsList() hasn't completed#11591
Closed
daniel-lxs wants to merge 1 commit intomainfrom
Closed
fix: MCP tool auto-approval fails when fetchToolsList() hasn't completed#11591daniel-lxs wants to merge 1 commit intomainfrom
daniel-lxs wants to merge 1 commit intomainfrom
Conversation
daniel-lxs
requested review from
cte,
hannesrudolph,
jr and
mrubens
as code owners
dosubot
bot
added
size:L
When an MCP tool call is auto-approval checked before fetchToolsList()
has completed, server.tools is empty so tool.alwaysAllow is never found.
The server's config JSON (set at connection creation time) already
contains the alwaysAllow array, so fall back to parsing server.config
when the tool-level flag isn't set. Supports both wildcard ("*") and
specific tool name matching.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
daniel-lxs
force-pushed
the
fix/mcp-tool-auto-approval-race-condition
branch
from
ef31602 to
0bd9857
Compare
daniel-lxs
changed the title
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
1 participant
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
autoApprovalEnabled,alwaysAllowMcp, and server-levelalwaysAllow: ["*"]all being configured. Root cause:isMcpToolAlwaysAllowedcheckstool.alwaysAllowon each tool object, but that flag is only set whenfetchToolsList()completes — which reads the config file from disk, callstools/liston the MCP server, and mapsalwaysAllowonto each tool. If a task's auto-approval check runs beforefetchToolsList()finishes,server.toolsis empty and the check returns false.server.config) already contains thealwaysAllowarray at connection creation time (set viaBaseConfigSchemaZod validation beforefetchToolsList()is even called). This fix adds a fallback that parsesserver.configwhen the tool-level flag isn't set, supporting both"*"wildcard and specific tool name matching.Test plan
isMcpToolAlwaysAllowedconfig fallback (wildcard*, specific tool name, no match, empty array, missing field, invalid JSON, unlisted tool with wildcard)🤖 Generated with Claude Code