fix: Local MCP tools remain available after mode switch from agent to non-agent#518
Merged
dwash96 merged 5 commits intoMay 19, 2026
Conversation
added 5 commits
May 18, 2026 15:54
Co-authored-by: cecli (openai/gemini_cli_local/gemini-2.5-pro)
Co-authored-by: cecli (openai/gemini_cli_local/gemini-2.5-pro)
Co-authored-by: cecli (openai/gemini_cli_local/gemini-2.5-pro)
Co-authored-by: cecli (openai/gemini_cli_local/gemini-2.5-pro)
Co-authored-by: cecli (openai/gemini_cli_local/gemini-2.5-pro)
Open
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
2 participants
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.
Problem
When switching from Agent mode to a non-agent mode (e.g.,
/code,/ask), the "Local" MCP server (which provides agent-only tools like tool calling and file editing) remained connected. This meant agent-specific tools were still available in non-agent modes, which is incorrect behavior.Changes
Core Fix: Local MCP Server Disconnection on Mode Switch
cecli/coders/base_coder.py: When switching from anAgentCoderto a non-agent coder, the "Local" MCP server is now disconnected. When switching back to agent mode, it reconnects automatically viainitialize_mcp_tools().Testing
tests/coders/test_coder_switching.pyto verify Local server disconnection/reconnection on mode switch