Update context_parser.py

context_parser.py

@@ -35,7 +35,9 @@ def parse_hidden_context(message: str) -> ParsedContext:
     options_text = ""
     recent_conversation = ""
 
-    if "Latest player message:" in raw:
+    if "USER_MESSAGE:" in raw:
+        visible_user_text = extract_section(raw, "USER_MESSAGE:", [])
+    elif "Latest player message:" in raw:
         visible_user_text = extract_section(raw, "Latest player message:", [])
     elif "Player message:" in raw:
         visible_user_text = extract_section(raw, "Player message:", [])
@@ -46,21 +48,40 @@ def parse_hidden_context(message: str) -> ParsedContext:
         question_text = extract_section(
             raw,
             "Question:",
-            ["\nOptions:", "\nPlayer balance:", "\nLast outcome:", "\nRecent conversation:", "\nLatest player message:", "\nPlayer message:"]
+            [
+                "\nOptions:",
+                "\nPlayer balance:",
+                "\nLast outcome:",
+                "\nRecent conversation:",
+                "\nLatest player message:",
+                "\nPlayer message:",
+                "\nUSER_MESSAGE:",
+            ],
         )
 
     if "Options:" in raw:
         options_text = extract_section(
             raw,
             "Options:",
-            ["\nPlayer balance:", "\nLast outcome:", "\nRecent conversation:", "\nLatest player message:", "\nPlayer message:"]
+            [
+                "\nPlayer balance:",
+                "\nLast outcome:",
+                "\nRecent conversation:",
+                "\nLatest player message:",
+                "\nPlayer message:",
+                "\nUSER_MESSAGE:",
+            ],
         )
 
     if "Recent conversation:" in raw:
         recent_conversation = extract_section(
             raw,
             "Recent conversation:",
-            ["\nLatest player message:", "\nPlayer message:"]
+            [
+                "\nLatest player message:",
+                "\nPlayer message:",
+                "\nUSER_MESSAGE:",
+            ],
         )
 
     combined_parts = []
@@ -88,14 +109,17 @@ def detect_help_mode(user_text: str, supplied: Optional[str]) -> str:
     lower = (user_text or "").lower().strip()
 
     if supplied in {"hint", "walkthrough", "answer"}:
-        if lower not in {"hint", "walkthrough", "answer"}:
-            if "hint" in lower:
-                return "hint"
-            if "walkthrough" in lower or "step by step" in lower or "work through" in lower:
-                return "walkthrough"
-            if "explain" in lower and "why" in lower:
-                return "walkthrough"
-            return supplied
+        if "hint" in lower:
+            return "hint"
+        if (
+            "walkthrough" in lower
+            or "step by step" in lower
+            or "work through" in lower
+            or "explain step by step" in lower
+        ):
+            return "walkthrough"
+        if "why" in lower or "explain" in lower:
+            return "walkthrough"
         return supplied
 
     if lower in {"hint", "just a hint", "hint please", "small hint"}:
@@ -125,20 +149,59 @@ def user_is_referring_to_existing_question(user_text: str, question_text: str) -
         return False
 
     short_refs = {
-        "help", "hint", "why", "why?", "explain", "explain it", "explain this",
-        "answer", "what's the answer", "what is the answer", "is it a", "is it b",
-        "is it c", "is it d", "is it e", "which one", "which option",
-        "what do i do first", "what do i do", "how do i start", "are you sure",
-        "can you help", "help me", "i don't get it", "i dont get it",
-        "why is it c", "why is it b", "why is it a", "why is it d", "why is it e"
+        "help",
+        "hint",
+        "why",
+        "why?",
+        "explain",
+        "explain it",
+        "explain this",
+        "answer",
+        "what's the answer",
+        "what is the answer",
+        "is it a",
+        "is it b",
+        "is it c",
+        "is it d",
+        "is it e",
+        "which one",
+        "which option",
+        "what do i do first",
+        "what do i do",
+        "how do i start",
+        "are you sure",
+        "can you help",
+        "help me",
+        "i don't get it",
+        "i dont get it",
+        "why is it c",
+        "why is it b",
+        "why is it a",
+        "why is it d",
+        "why is it e",
+        "what is the question asking me to do",
+        "what is this asking",
+        "what do you need",
     }
 
     if lower in short_refs:
         return True
 
-    if len(lower) <= 25 and any(phrase in lower for phrase in [
-        "is it ", "why", "hint", "explain", "answer", "help", "first step"
-    ]):
+    if any(
+        phrase in lower
+        for phrase in [
+            "is it ",
+            "why",
+            "hint",
+            "explain",
+            "answer",
+            "help",
+            "first step",
+            "what is the question asking",
+            "what is this asking",
+            "what do you need",
+        ]
+    ):
         return True
 
     return False
@@ -146,6 +209,7 @@ def user_is_referring_to_existing_question(user_text: str, question_text: str) -
 
 def mentions_choice_letter(user_text: str) -> Optional[str]:
     lower = (user_text or "").lower().strip()
+
     m = re.search(r"\b(?:is it|answer is|it's|its|option|choice)\s*([a-e])\b", lower)
     if m:
         return m.group(1).upper()