feat: enhance chat functionality with system instructions and MCP client integration

app.py

@@ -4,6 +4,8 @@ import sys
 # Add src directory to Python path for Hugging Face Spaces compatibility
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 
+import ast
+import json
 import logging
 from pathlib import Path
 
@@ -11,6 +13,7 @@ import gradio as gr
 import spaces
 
 from unpredictable_lord.chat.chat import chat_with_mcp_tools
+from unpredictable_lord.chat.mcp_client import MCPClient
 from unpredictable_lord.mcp_server.game_state import PERSONALITY_DESCRIPTIONS
 from unpredictable_lord.mcp_server.mcp_server import (
     execute_turn,
@@ -45,8 +48,9 @@ NO_GAME_MESSAGE = """_No active game._
 with gr.Blocks(title="Unpredictable Lord") as demo:
     gr.Markdown("# Unpredictable Lord\nLord Advisor AI Simulation")
 
-    # State to store current session_id for Chat tab
+    # State to store current session_id and system_instructions for Chat tab
     chat_session_id = gr.State(value=None)
+    chat_system_instructions = gr.State(value="")
 
     with gr.Tabs():
         # Chat Tab
@@ -130,10 +134,23 @@ with gr.Blocks(title="Unpredictable Lord") as demo:
                         )
 
             # Helper functions for Chat tab
-            def start_chat_game(personality: str):
-                """Start a new game and return updated UI state."""
-                result = init_game(personality)
+            async def start_chat_game(personality: str):
+                """Start a new game via MCP client and return updated UI state."""
+                # Call init_game via MCP client
+                mcp_client = MCPClient()
+                result_json = await mcp_client.call_tool(
+                    "init_game", {"personality": personality}
+                )
+
+                # Parse result - MCP may return JSON or Python dict repr
+                try:
+                    result = json.loads(result_json)
+                except json.JSONDecodeError:
+                    # Gradio MCP sometimes returns Python dict repr (single quotes)
+                    result = ast.literal_eval(result_json)
+
                 session_id = result.get("session_id", "")
+                system_instructions = result.get("system_instructions", "")
                 state = result.get("initial_state", {})
                 personality_name = personality.capitalize()
                 personality_desc = PERSONALITY_DESCRIPTIONS.get(personality, "")
@@ -142,8 +159,31 @@ with gr.Blocks(title="Unpredictable Lord") as demo:
 
 _{personality_desc}_"""
 
+                # Build initial chat message with game context (collapsible)
+                initial_state_text = f"""**Session ID:** {session_id}
+**Personality:** {personality_name}
+
+**Initial State:**
+- Territory: {state.get("territory", 50)}
+- Population: {state.get("population", 50)}
+- Treasury: {state.get("treasury", 50)}
+- Satisfaction: {state.get("satisfaction", 50)}
+- Royal Trust: {state.get("royal_trust", 50)}
+- Advisor Trust: {state.get("advisor_trust", 50)}
+
+{system_instructions}
+"""
+                initial_history = [
+                    gr.ChatMessage(
+                        role="user",
+                        content=initial_state_text,
+                        metadata={"title": "🎮 Game Initialized", "status": "done"},
+                    )
+                ]
+
                 return (
                     session_id,
+                    system_instructions,
                     status_md,
                     state.get("territory", 50),
                     state.get("population", 50),
@@ -151,7 +191,7 @@ _{personality_desc}_"""
                     state.get("satisfaction", 50),
                     state.get("royal_trust", 50),
                     state.get("advisor_trust", 50),
-                    [],  # Clear chat history
+                    initial_history,
                     gr.update(
                         interactive=True, placeholder="My Lord, I have a proposal..."
                     ),
@@ -162,6 +202,7 @@ _{personality_desc}_"""
                 """Reset game state to initial values."""
                 return (
                     None,  # session_id
+                    "",  # system_instructions
                     NO_GAME_MESSAGE,
                     50,
                     50,
@@ -236,13 +277,13 @@ _{personality_desc}_"""
                 # Append user message to history in messages format
                 return "", history + [{"role": "user", "content": user_message}]
 
-            async def bot(history, session_id, personality):
+            async def bot(history, system_instructions):
                 # The last message is the user's message
                 user_message = history[-1]["content"]
                 history_for_model = history[:-1]
 
                 async for updated_history in chat_with_mcp_tools(
-                    user_message, history_for_model, session_id, personality
+                    user_message, history_for_model, system_instructions
                 ):
                     yield updated_history
 
@@ -252,6 +293,7 @@ _{personality_desc}_"""
                 inputs=chat_personality,
                 outputs=[
                     chat_session_id,
+                    chat_system_instructions,
                     game_status_md,
                     territory_bar,
                     population_bar,
@@ -271,6 +313,7 @@ _{personality_desc}_"""
                 inputs=[],
                 outputs=[
                     chat_session_id,
+                    chat_system_instructions,
                     game_status_md,
                     territory_bar,
                     population_bar,
@@ -289,7 +332,7 @@ _{personality_desc}_"""
                 user, [msg, chatbot], [msg, chatbot], queue=False, show_api=False
             ).then(
                 bot,
-                [chatbot, chat_session_id, chat_personality],
+                [chatbot, chat_system_instructions],
                 chatbot,
                 show_api=False,
             ).then(
@@ -311,7 +354,7 @@ _{personality_desc}_"""
                 user, [msg, chatbot], [msg, chatbot], queue=False, show_api=False
             ).then(
                 bot,
-                [chatbot, chat_session_id, chat_personality],
+                [chatbot, chat_system_instructions],
                 chatbot,
                 show_api=False,
             ).then(

src/unpredictable_lord/chat/chat.py

@@ -15,7 +15,6 @@ from unpredictable_lord.chat.chat_tools import (
     execute_tool_calls,
     extract_tool_calls,
 )
-from unpredictable_lord.mcp_server.game_state import PERSONALITY_DESCRIPTIONS
 from unpredictable_lord.settings import USE_MODAL
 
 logger = logging.getLogger(__name__)
@@ -52,47 +51,20 @@ def _get_encoding():
     return oh.load_harmony_encoding(oh.HarmonyEncodingName.HARMONY_GPT_OSS)
 
 
-def _build_system_message(session_id: str, personality: str) -> oh.Message:
-    """Build developer message with system prompt and tool definitions."""
-    personality_desc = PERSONALITY_DESCRIPTIONS.get(personality, "")
+def _build_developer_message(system_instructions: str) -> oh.Message:
+    """Build developer message with system instructions and tool definitions.
 
-    system_prompt = f"""You are a {personality} lord of a medieval fantasy kingdom.
-{personality_desc}
-
-The user is your advisor. Listen to your advisor's advice and decide whether to follow it.
-Speak in an arrogant but thoughtful tone befitting a medieval lord.
-
-Current game session: {session_id}
-
-When you decide to take an action based on advice, you MUST call the execute_turn tool with the session_id and the appropriate advice type.
-Available advice options:
-- increase_tax: Raise taxes (Treasury ↑, Satisfaction ↓)
-- decrease_tax: Lower taxes (Treasury ↓, Satisfaction ↑)
-- expand_territory: Military expansion (Territory ↑, Treasury ↓, risky)
-- improve_diplomacy: Diplomatic efforts (Royal Trust ↑, Treasury ↓)
-- public_festival: Hold festival (Satisfaction ↑, Treasury ↓)
-- build_infrastructure: Build infrastructure (Population ↑, Treasury ↓)
-- do_nothing: Maintain current state
-
-After calling execute_turn, summarize the results to your advisor in character.
-
-TOOL USAGE GUIDELINES:
-- After receiving tool results, ALWAYS respond with text (do not call more tools)
-- Keep the conversation flowing naturally without excessive tool calls
-
-IMPORTANT: After each action or when starting a conversation:
-1. Explain the current situation and any recent changes
-2. Ask your advisor what they suggest next
-3. Be specific about what challenges or opportunities exist
-
-Example: "The treasury has grown, but whispers of discontent spread among the peasants.
-What counsel do you offer, advisor? Shall we address their grievances or press our advantage?"
-"""
+    Args:
+        system_instructions: System instructions from init_game() that define
+                            the lord's personality, game state, and roleplay rules.
 
+    Returns:
+        openai-harmony Message with developer role containing instructions and tools.
+    """
     return oh.Message.from_role_and_content(
         oh.Role.DEVELOPER,
         oh.DeveloperContent.new()
-        .with_instructions(system_prompt)
+        .with_instructions(system_instructions)
         .with_function_tools(TOOL_DEFINITIONS),
     )
 
@@ -162,8 +134,7 @@ async def _stream_response(
 async def chat_with_mcp_tools(
     user_message: str,
     chat_history: list[dict[str, str]],
-    session_id: str,
-    personality: str,
+    system_instructions: str,
 ) -> AsyncGenerator[list[dict], None]:
     """
     Chat with LLM with MCP tool support (async streaming version).
@@ -171,8 +142,8 @@ async def chat_with_mcp_tools(
     Args:
         user_message: User's message
         chat_history: Past chat history (list of dictionaries in Gradio format)
-        session_id: Current game session ID
-        personality: Lord's personality type
+        system_instructions: System instructions from init_game() that define
+                            the lord's personality, game state, and roleplay rules.
 
     Yields:
         updated_chat_history: Updated chat history (Gradio format)
@@ -181,7 +152,7 @@ async def chat_with_mcp_tools(
         encoding = _get_encoding()
 
         # Build messages
-        messages = [_build_system_message(session_id, personality)]
+        messages = [_build_developer_message(system_instructions)]
         messages.extend(_convert_history_to_messages(chat_history))
         messages.append(oh.Message.from_role_and_content(oh.Role.USER, user_message))