Updated for game

app.py

@@ -250,30 +250,40 @@ async def stream_response(query, history, game_context=None, mode: Optional[str]
             yield chunk
 
 def _format_game_context_for_prompt(game_context: Optional[Union[str, Dict[str, Any]]]) -> str:
-    """Return a concise text snippet to inject into the system prompt from game context."""
+    """Return a concise text snippet to inject into the system prompt from game context.
+
+    Key changes:
+    - Prefer current station (id/name) and filter transcript strictly to this station to avoid confusion.
+    - Include admin-provided extras when available.
+    - Provide a short visited list for flavor only.
+    """
     if not game_context:
         return ""
     try:
         if isinstance(game_context, str):
             return f"\nGAME CONTEXT: The player is currently at a station about {game_context}."
         if isinstance(game_context, dict):
-            current = game_context.get('current_station') or game_context.get('station') or ''
-            current_id = game_context.get('current_station_id') or ''
+            current = (game_context.get('current_station') or game_context.get('station') or '').strip()
+            current_id = (game_context.get('current_station_id') or '').strip()
             visited = game_context.get('visited_stations') or []
-            context = game_context.get('context') or game_context.get('current_context') or ''
+            context = (game_context.get('context') or game_context.get('current_context') or '').strip()
+
             parts = ["\nGAME CONTEXT:"]
-            if current:
-                parts.append(f"Current station: {current}.")
+            if current or current_id:
+                parts.append(f"Current station: {current} (id: {current_id}).")
             if context:
                 parts.append(f"Station details: {context}.")
+
             # Look up admin-provided extras
             extra_text = ''
             if current_id:
-                extra_text = STATION_EXTRAS_BY_ID.get(str(current_id).strip().lower(), '')
+                extra_text = STATION_EXTRAS_BY_ID.get(current_id.lower(), '')
             if not extra_text and current:
-                extra_text = STATION_EXTRAS_BY_NAME.get(str(current).strip().lower(), '')
+                extra_text = STATION_EXTRAS_BY_NAME.get(current.lower(), '')
             if extra_text:
-                parts.append(f"Additional station notes: {extra_text}")
+                parts.append(f"Additional station notes (must consider): {extra_text}")
+
+            # Visited list (names only, de-duplicated)
             if visited:
                 try:
                     uniq = []
@@ -284,27 +294,41 @@ def _format_game_context_for_prompt(game_context: Optional[Union[str, Dict[str,
                         parts.append(f"Visited stations so far: {', '.join(uniq)}.")
                 except Exception:
                     pass
-            # Memory transcript (last messages)
+
+            # Memory transcript: include only messages tied to this station to reduce confusion
             mem = game_context.get('__memory') if isinstance(game_context, dict) else None
             if isinstance(mem, dict):
                 try:
                     transcript = mem.get('transcript') or []
-                    if transcript:
-                        # Take last few lines and embed compactly
-                        lines = []
-                        for m in transcript[-20:]:
-                            role = (m.get('role') or '').strip()
-                            src = (m.get('source') or '').strip()
-                            sta = (m.get('stationName') or '').strip()
-                            txt = (m.get('content') or '').replace('\n',' ').strip()
-                            if len(txt) > 2000:
-                                txt = txt[:2000] + '…'
-                            label = role if role else 'msg'
-                            if src or sta:
-                                label += f"[{src}{'/' + sta if sta else ''}]"
-                            lines.append(f"- {label}: {txt}")
-                        if lines:
-                            parts.append("Recent game exchanges:\n" + "\n".join(lines))
+                    if transcript and (current or current_id):
+                        def belongs_here(m: Dict[str, Any]) -> bool:
+                            sid = (m.get('stationId') or '').strip()
+                            sname = (m.get('stationName') or '').strip()
+                            if current_id and sid:
+                                if sid.strip().lower() == current_id.lower():
+                                    return True
+                            if current and sname:
+                                if sname.strip().lower() == current.lower():
+                                    return True
+                            return False
+
+                        filtered = [m for m in transcript if belongs_here(m)]
+                        # if nothing matches, don't include cross-station chatter
+                        if filtered:
+                            lines = []
+                            for m in filtered[-20:]:
+                                role = (m.get('role') or '').strip()
+                                src = (m.get('source') or '').strip()
+                                sta = (m.get('stationName') or '').strip()
+                                txt = (m.get('content') or '').replace('\n', ' ').strip()
+                                if len(txt) > 2000:
+                                    txt = txt[:2000] + '…'
+                                label = role if role else 'msg'
+                                if src or sta:
+                                    label += f"[{src}{'/' + sta if sta else ''}]"
+                                lines.append(f"- {label}: {txt}")
+                            if lines:
+                                parts.append("Recent exchanges at this station:\n" + "\n".join(lines))
                 except Exception:
                     pass
             return " ".join(parts)
@@ -324,10 +348,11 @@ async def stream_response_gemini(query, history, game_context=None, mode: Option
     if is_game_mode:
         system_prompt = (
             "You are Tim Luka Horstmann as a friendly in-game 'Station Guide'. "
-            "Stay in first person. Prioritize the current station context provided. "
-            "Use the CV for personal facts, roles and dates. "
-            "For non-personal or general questions (e.g., about cities or institutions), you may use general world knowledge. "
-            "Do not invent personal details beyond the CV/FAQs; if specifics are unknown, say so briefly. "
+            "Stay in first person. The current station is the primary focus—treat it as 'now' even when revisiting. "
+            "Use the CV for personal facts, roles and dates; include 'Additional station notes' if present and relevant. "
+            "Keep answers concise (2–4 sentences). If off-topic, answer briefly, then gently steer back to the current station. "
+            "When revisiting a station, optionally acknowledge the revisit in one short clause. "
+            "End with a tiny hint or nudge (optional) about what to explore here or next. "
             f"Today's date is {current_date}. CV: {full_cv_text}" + game_context_text
         )
     else:
@@ -411,10 +436,11 @@ async def stream_response_local(query, history, game_context=None, mode: Optiona
     if is_game_mode:
         system_prompt = (
             "/no_think You are Tim Luka Horstmann as a friendly in-game 'Station Guide'. "
-            "Stay in first person. Prioritize the current station context provided. "
-            "Use the CV for personal facts, roles and dates. "
-            "For non-personal or general questions (e.g., about cities or institutions), you may use general world knowledge. "
-            "Do not invent personal details beyond the CV/FAQs; if specifics are unknown, say so briefly. "
+            "Stay in first person. The current station is the primary focus—treat it as 'now' even when revisiting. "
+            "Use the CV for personal facts, roles and dates; include 'Additional station notes' if present (do not ignore them). "
+            "Keep answers concise (2–4 sentences). If off-topic, answer briefly, then gently steer back to the current station. "
+            "When revisiting a station, optionally acknowledge the revisit in one short clause. "
+            "End with a tiny hint or nudge (optional) about what to explore here or next. "
             f"Today's date is {current_date}. CV: {full_cv_text}" + game_context_text
         )
     else: