fix: restore MCP tool auto-approval behavior for issue #9214 #9215
+301
−3
Conversation
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
…nabled - Fixed regression introduced in #9157 where MCP tools required individual alwaysAllow property - When alwaysAllowMcp is true, all MCP tools are now auto-approved by default - Tools can still opt-out by explicitly setting alwaysAllow=false - Added comprehensive tests for MCP auto-approval scenarios Fixes #9204
dosubot
bot
added
the
size:L
Contributor
Author
Review completed. Found 1 minor issue to address:
Mention @roomote in a comment to request specific changes to this pull request or fix all unresolved issues. |
![roomote[bot]](https://avatars.githubusercontent.com/in/1546624?s=60&v=4){kind=small}
| import type { McpServer, McpTool } from "../../shared/mcp" | ||
|
|
||
| import { isWriteToolAction, isReadOnlyToolAction } from "./tools" | ||
| import { isMcpToolAlwaysAllowed } from "./mcp" |
Contributor
Author
There was a problem hiding this comment.
The isMcpToolAlwaysAllowed import is no longer used after the refactoring and should be removed to keep the code clean.
Fix it with Roo Code or mention @roomote and request a fix.
hannesrudolph
added
the
Issue/PR - Triage
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.
This PR attempts to address Issue #9214. Feedback and guidance are welcome.
Problem
After the recent refactoring that moved auto-approval logic from ChatView to Task (#9157), the MCP auto-approval behavior changed. When
alwaysAllowMcpwas enabled with tools marked as "always allow", the UI was still asking for permission in v3.31.1.Solution
Changed the logic to properly handle MCP tool auto-approval:
alwaysAllowMcpis enabled → auto-approve all MCP tools by defaultalwaysAllow=falseChanges
src/core/auto-approval/index.tsto check globalalwaysAllowMcpfirstsrc/core/auto-approval/__tests__/checkAutoApproval.spec.tsTesting
Fixes #9214
Important
Restores MCP tool auto-approval behavior in
index.tsand adds tests incheckAutoApproval.spec.tsto handle global and individual tool settings.alwaysAllowMcpis enabled inindex.ts.alwaysAllow=false.checkAutoApproval.spec.tsfor various scenarios including missing tools, invalid JSON, and unknown servers.This description was created by
for b8f00cc. You can customize this summary. It will automatically update as commits are pushed.