Update conversation_logic.py

conversation_logic.py

@@ -653,13 +653,36 @@ class ConversationEngine:
                 verbosity=verbosity,
             )
 
-        # Merge solver result into base result, but do not let it automatically decide the reply.
+        # Merge solver result into base result only if it agrees with the classified topic.
         if solver_result is not None:
-            result = solver_result
-            result.domain = "quant"
             result.meta = result.meta or {}
-            if not result.topic or result.topic in {"general_quant", "general", "unknown"}:
-                result.topic = question_topic
+            solver_topic = getattr(solver_result, "topic", None) or "unknown"
+            
+            compatible_topics = {
+                question_topic,
+                "general_quant",
+                "general",
+                "unknown",
+            }
+            
+            # allow a few sensible cross-matches
+            if question_topic == "algebra":
+                compatible_topics.update({"ratio"})
+            elif question_topic == "ratio":
+                compatible_topics.update({"algebra"})
+            elif question_topic == "percent":
+                compatible_topics.update({"ratio", "algebra"})
+            
+            if solver_topic in compatible_topics:
+                result = solver_result
+                result.domain = "quant"
+                result.meta = result.meta or {}
+                result.topic = question_topic if question_topic else solver_topic
+                result.meta["solver_topic_accepted"] = solver_topic
+            else:
+                result.meta["solver_topic_rejected"] = solver_topic
+                result.meta["solver_topic_expected"] = question_topic
+                result.topic = question_topic if is_quant else result.topic
         else:
             result.meta = result.meta or {}
             result.topic = question_topic if is_quant else result.topic
@@ -669,6 +692,7 @@ class ConversationEngine:
         solver_has_steps = bool(solver_steps)
         prefer_question_support = _should_prefer_question_support(resolved_help_mode, fallback_pack)
         direct_solve_request = _is_direct_solve_request(user_text or solver_input, resolved_intent)
+        solver_topic_ok = result.meta.get("solver_topic_rejected") is None
 
         result.help_mode = resolved_help_mode
         result.meta = result.meta or {}
@@ -727,7 +751,11 @@ class ConversationEngine:
                 hint_stage=hint_stage,
                 topic=result.topic,
             )
-        elif resolved_help_mode == "answer" and solver_has_steps:
+        elif (
+            resolved_help_mode == "answer"
+            and solver_has_steps
+            and result.meta.get("solver_topic_rejected") is None
+        ):
             reply_core = _answer_path_from_steps(solver_steps, verbosity=verbosity)
             result.meta["response_source"] = "solver_steps"
             result.meta["question_support_used"] = False
@@ -740,7 +768,12 @@ class ConversationEngine:
                 hint_stage=hint_stage,
                 topic=result.topic,
             )
-        elif resolved_help_mode == "walkthrough" and solver_has_steps and not prefer_question_support:
+        elif (
+            resolved_help_mode == "walkthrough"
+            and solver_has_steps
+            and not prefer_question_support
+            and result.meta.get("solver_topic_rejected") is None
+        ):
             reply_core = _answer_path_from_steps(solver_steps, verbosity=verbosity)
             result.meta["response_source"] = "solver_steps"
             result.meta["question_support_used"] = False