feat: integrate tool prefix handling for MCP tools in chat functionality

app.py

@@ -23,6 +23,7 @@ from unpredictable_lord.mcp_server.mcp_server import (
     list_available_advice,
 )
 from unpredictable_lord.settings import ENABLE_GRADIO_DEPRECATION_WARNING, LOGGING_LEVEL
+from unpredictable_lord.utils import get_tool_prefix
 
 # Configure logging level from environment variable
 log_level = getattr(logging, LOGGING_LEVEL, logging.INFO)
@@ -52,6 +53,10 @@ NO_GAME_MESSAGE = """_No active game._
 2. Click "⚔️ Start New Game"
 """
 
+# MCP tool prefix for HF Spaces
+tool_prefix = get_tool_prefix()
+logger.info(f"Using tool prefix: '{tool_prefix}'")
+
 
 # Gradio UI
 with gr.Blocks(title="Unpredictable Lord") as demo:
@@ -145,12 +150,6 @@ with gr.Blocks(title="Unpredictable Lord") as demo:
             # Helper functions for Chat tab
             async def start_chat_game(personality: str):
                 """Start a new game via MCP client and return updated UI state."""
-                # Get tool prefix from Gradio's MCP server (handles HF Spaces naming)
-                tool_prefix = ""
-                if demo.mcp_server_obj:
-                    tool_prefix = demo.mcp_server_obj.tool_prefix.replace("-", "_")
-                    logger.info(f"Using tool prefix: '{tool_prefix}'")
-
                 # Call init_game via MCP client
                 mcp_client = MCPClient(tool_prefix=tool_prefix)
                 result_json = await mcp_client.call_tool(
@@ -298,7 +297,7 @@ _{personality_desc}_"""
                 history_for_model = history[:-1]
 
                 async for updated_history in chat_with_mcp_tools(
-                    user_message, history_for_model, system_instructions
+                    user_message, history_for_model, system_instructions, tool_prefix
                 ):
                     yield updated_history
 

src/unpredictable_lord/chat/chat.py

@@ -135,6 +135,7 @@ async def chat_with_mcp_tools(
     user_message: str,
     chat_history: list[dict[str, str]],
     system_instructions: str,
+    tool_prefix: str,
 ) -> AsyncGenerator[list[dict], None]:
     """
     Chat with LLM with MCP tool support (async streaming version).
@@ -211,7 +212,7 @@ async def chat_with_mcp_tools(
             yield partial_history
 
             # Execute tools via MCP
-            tool_result_messages = await execute_tool_calls(tool_calls)
+            tool_result_messages = await execute_tool_calls(tool_calls, tool_prefix)
 
             messages.extend(tool_result_messages)
 

src/unpredictable_lord/chat/chat_tools.py

@@ -14,6 +14,7 @@ from unpredictable_lord.chat.mcp_client import MCPClient
 
 logger = logging.getLogger(__name__)
 
+
 # Tool definitions matching MCP tools in mcp_tools.py
 TOOL_DEFINITIONS = [
     oh.ToolDescription(
@@ -123,11 +124,12 @@ def extract_tool_calls(parsed_messages: list[oh.Message]) -> list[oh.Message]:
     ]
 
 
-async def _execute_tool(tool_name: str, params: dict) -> str:
+async def _execute_tool(tool_name: str, tool_prefix: str, params: dict) -> str:
     """Execute a single MCP tool and return the result as JSON string.
 
     Args:
         tool_name: Name of the tool to execute.
+        tool_prefix: Prefix to use for the tool name.
         params: Tool parameters as a dictionary.
 
     Returns:
@@ -135,7 +137,7 @@ async def _execute_tool(tool_name: str, params: dict) -> str:
     """
     import ast
 
-    mcp_client = MCPClient()
+    mcp_client = MCPClient(tool_prefix=tool_prefix)
     try:
         result = await mcp_client.call_tool(tool_name, params)
 
@@ -162,11 +164,14 @@ async def _execute_tool(tool_name: str, params: dict) -> str:
         return json.dumps({"error": str(e)}, ensure_ascii=False)
 
 
-async def execute_tool_calls(tool_calls: list[oh.Message]) -> list[oh.Message]:
+async def execute_tool_calls(
+    tool_calls: list[oh.Message], tool_prefix: str
+) -> list[oh.Message]:
     """Execute tool calls and return result messages.
 
     Args:
         tool_calls: List of tool call messages extracted from parser.
+        tool_prefix: Prefix to use for the tool names.
 
     Returns:
         List of tool result messages to be added to conversation.
@@ -189,7 +194,7 @@ async def execute_tool_calls(tool_calls: list[oh.Message]) -> list[oh.Message]:
         logger.info(f"Executing MCP tool: {tool_name} with params: {params}")
 
         # Execute tool via MCP (returns JSON string)
-        result_json = await _execute_tool(tool_name, params)
+        result_json = await _execute_tool(tool_name, tool_prefix, params)
 
         logger.info(f"Tool {tool_name} result: {result_json}")
 

src/unpredictable_lord/utils.py

@@ -0,0 +1,18 @@
+import os
+
+
+def get_tool_prefix() -> str:
+    """Get the MCP tool prefix for HuggingFace Spaces.
+
+    Gradio adds a prefix based on the Space ID. This function replicates
+    that logic to ensure tool names match.
+
+    Returns:
+        Tool prefix string (empty on local, "space_name_" on HF Spaces).
+    """
+    space_id = os.environ.get("SPACE_ID", "")
+    if space_id:
+        prefix = space_id.split("/")[-1] + "_"
+        prefix = prefix.replace("-", "_")
+        return prefix
+    return ""