Skip to content

fix: MCP tools being filtered out when a specific plugin set is configured in the / WebUI修复 MCP 工具在插件过滤时被意外过滤的问题 #4825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Soulter merged 2 commits into from
Feb 3, 2026
Merged

fix: MCP tools being filtered out when a specific plugin set is configured in the / WebUI修复 MCP 工具在插件过滤时被意外过滤的问题 #4825

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b45c45
fix: preserve MCP tools in _plugin_tool_fix filter
idiotsj Feb 2, 2026
bd8be71
fix: retain MCP tools in _plugin_tool_fix function
Soulter Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions astrbot/core/astr_main_agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,11 +708,18 @@ def _sanitize_context_by_modalities(


def _plugin_tool_fix(event: AstrMessageEvent, req: ProviderRequest) -> None:
"""根据事件中的插件设置，过滤请求中的工具列表。

注意：没有 handler_module_path 的工具（如 MCP 工具）会被保留，
因为它们不属于任何插件，不应被插件过滤逻辑影响。
"""
if event.plugins_name is not None and req.func_tool:
new_tool_set = ToolSet()
for tool in req.func_tool.tools:
mp = tool.handler_module_path
if not mp:
# 保留没有 handler_module_path 的工具（如 MCP 工具）
new_tool_set.add_tool(tool)
continue
plugin = star_map.get(mp)
if not plugin:
Expand Down