Update conversation_logic.py

conversation_logic.py

@@ -55,6 +55,16 @@ FOLLOWUP_ONLY_INPUTS = {
     "can i have a hint",
     "next hint",
     "another hint",
+    "more hint",
+    "more hints",
+    "second hint",
+    "third hint",
+    "second next hint",
+    "what do i do first",
+    "what should i do first",
+    "what do i do next",
+    "what should i do next",
+    "first step",
     "next step",
     "continue",
     "go on",
@@ -299,7 +309,23 @@ def _classify_input_type(raw_user_text: str) -> str:
 
     if text in {"hint", "a hint", "give me a hint", "can i have a hint"} or text.startswith("hint:"):
         return "hint"
-    if text in {"next hint", "another hint", "more hint", "more hints", "next step", "continue", "go on"} or text.startswith("next hint:"):
+    if any(
+        phrase in text
+        for phrase in [
+            "next hint",
+            "another hint",
+            "more hint",
+            "more hints",
+            "second hint",
+            "third hint",
+            "second next hint",
+            "what do i do next",
+            "what should i do next",
+            "next step",
+            "continue",
+            "go on",
+        ]
+    ) or text.startswith("next hint:"):
         return "next_hint"
     if any(
         x in text
@@ -1028,8 +1054,14 @@ def _should_prefer_question_support(help_mode: str, fallback_pack: Dict[str, Any
     if not fallback_pack:
         return False
     support_source = str(fallback_pack.get("support_source", "")).strip().lower()
-    has_specific_content = support_source in {"question_bank", "question_id", "question_text"}
-    if help_mode in {"hint", "walkthrough", "instruction", "step_by_step", "explain"}:
+    has_specific_content = support_source in {
+        "question_bank",
+        "question_bank_refined",
+        "question_id",
+        "question_text",
+        "generated_question_specific",
+    }
+    if help_mode in {"hint", "walkthrough", "instruction", "step_by_step", "explain", "method"}:
         return has_specific_content or bool(fallback_pack)
     return False
 
@@ -1211,7 +1243,7 @@ class ConversationEngine:
         result.help_mode = resolved_help_mode
         result.meta = result.meta or {}
         result.meta["hint_stage"] = hint_stage
-        result.meta["max_stage"] = 3
+        result.meta["max_stage"] = 4
         result.meta["recovered_question_text"] = solver_input
         result.meta["question_id"] = question_id
         result.meta["classified_topic"] = question_topic if question_topic else "general"
@@ -1289,14 +1321,21 @@ class ConversationEngine:
         if input_type in {"hint", "next_hint"}:
             hint_lines: List[str] = []
 
-            custom_ladder = _question_specific_hint_ladder(
-                question_text=solver_input,
-                options_text=options_text,
-                classified_topic=question_topic,
-            )
-            if custom_ladder:
-                idx = min(max(hint_stage - 1, 0), len(custom_ladder) - 1)
-                hint_lines = [custom_ladder[idx]]
+            if fallback_pack:
+                fallback_hints = _safe_meta_list(fallback_pack.get("hint_ladder", []))
+                if fallback_hints:
+                    idx = min(max(hint_stage - 1, 0), len(fallback_hints) - 1)
+                    hint_lines = [fallback_hints[idx]]
+
+            if not hint_lines:
+                custom_ladder = _question_specific_hint_ladder(
+                    question_text=solver_input,
+                    options_text=options_text,
+                    classified_topic=question_topic,
+                )
+                if custom_ladder:
+                    idx = min(max(hint_stage - 1, 0), len(custom_ladder) - 1)
+                    hint_lines = [custom_ladder[idx]]
 
             if not hint_lines and explainer_scaffold:
                 ladder = _safe_meta_list(explainer_scaffold.get("hint_ladder", []))
@@ -1311,12 +1350,6 @@ class ConversationEngine:
                 elif next_hint_text:
                     hint_lines = [next_hint_text]
 
-            if not hint_lines and fallback_pack:
-                fallback_hints = _safe_meta_list(fallback_pack.get("hint_ladder", []))
-                if fallback_hints:
-                    idx = min(max(hint_stage - 1, 0), len(fallback_hints) - 1)
-                    hint_lines = [fallback_hints[idx]]
-
             if not hint_lines and fallback_reply_core:
                 split_lines = [line.strip("- ").strip() for line in fallback_reply_core.splitlines() if line.strip()]
                 if split_lines:
@@ -1344,6 +1377,7 @@ class ConversationEngine:
 
         elif question_specific_reply_core and (
             input_type not in {"hint", "next_hint"}
+            and not (prefer_question_support and fallback_reply_core)
             and (
                 _is_help_first_mode(resolved_help_mode)
                 or input_type in {"other", "confusion"}
@@ -1353,6 +1387,8 @@ class ConversationEngine:
                         "how do i solve",
                         "what do i do first",
                         "what should i do first",
+                        "what do i do next",
+                        "what should i do next",
                         "how should i start",
                     ]
                 )