fix: detect Droid MCP tools using ___ delimiter#7
Merged
Conversation
Droid's MCP tool naming convention uses serverName___toolName (e.g. corridor___listProjects) instead of Claude's mcp__server__tool format. Without this fix, all Droid MCP tools are classified as ExecutionTool instead of ExecutionMCP, causing the unified execution handler to silently skip them.
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
![corridor-security[bot]](https://avatars.githubusercontent.com/in/1177339?s=60&v=4){kind=small}
There was a problem hiding this comment.
Summary: This PR adds string-based detection for Droid MCP tool names (using the "___" delimiter) in OnBeforeExecution and associated tests; it only inspects ToolName strings and does not execute user-controlled input. No exploitable security vulnerabilities were identified.
Risk: Low risk. The change is limited to classification logic with no new attack surface, external integrations, or sensitive data handling, and it does not introduce command execution or path handling.
Recommendations:
- Ensure downstream MCP execution paths continue to validate MCP URLs and commands (allowlist domains, deny localhost/private IPs, and avoid re-executing user-controlled command strings) regardless of how the tool type is detected.
ashwin-corridor
approved these changes
Feb 27, 2026
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.
Summary
serverName___toolNameformat (e.g.corridor___listProjects) instead of Claude'smcp__server__toolformatOnBeforeExecutionhandler now checks for___in the tool name as an additional MCP detection pathExecutionTooland silently allowed, bypassing compliance checks and debug loggingTest plan
TestDroidPreToolUse_MCPTypeDetectioncoveringcorridor___listProjects→ MCP,Read→ tool,Bash→ shell