mcp-tool-naming-fix

backend/python/app/api/chat_service.py

@@ -3396,7 +3396,9 @@ async def _send_message_core(
 
 
 
-                                _fname = f"mcp_tool_{mcp_idx}"
+                                _sname = re.sub(r'[^A-Za-z0-9_-]', '_', _srv.get("name","unknown")[:30])
+                                _tname = re.sub(r'[^A-Za-z0-9_-]', '_', _t.get("name","tool")[:50])
+                                _fname = f"mcp__{_sname}__{_tname}__{mcp_idx}"
 
 
 
@@ -5194,7 +5196,7 @@ async def _send_message_core(
 
 
 
-                                        _mcp_info = mcp_tool_map.get(func_name) if func_name.startswith("mcp_tool_") else None
+                                        _mcp_info = mcp_tool_map.get(func_name) if func_name.startswith("mcp__") else None
 
 
 
@@ -5378,7 +5380,7 @@ async def _send_message_core(
 
 
 
-                                        if func_name.startswith("mcp_tool_"):
+                                        if func_name.startswith("mcp__"):
 
 
 
@@ -8445,7 +8447,7 @@ def _check_tool_policy(func_name, mcp_info, skills, policy, call_count, round_co
 
 
 
-    is_mcp = func_name.startswith("mcp_tool_")
+    is_mcp = func_name.startswith("mcp__")