fix: logic for ros array mapping and loop guard progress evaluation

app/graph.py

@@ -134,37 +134,38 @@ def agent_node(state: IntakeState) -> dict:
 
     # ── Loop Guard: if LLM returned same reply as last turn, force-fill stuck field ──
     if _detect_repeat({"messages": msgs + [{"role": "assistant", "content": result.reply}]}):
+        # Check if the LLM made progress extracting data despite repeating the reply
+        try:
+            prev_state = CombinedOutput.model_validate_json(current_json)
+            prev_filled = sum(1 for f in HPI_FIELDS if getattr(prev_state, f, None)) + len(prev_state.ros)
+            new_filled = sum(1 for f in HPI_FIELDS if getattr(result, f, None)) + len(result.ros)
+            made_progress = new_filled > prev_filled
+        except Exception:
+            made_progress = False
+
         hpi_filled = all(getattr(result, f, None) for f in HPI_FIELDS)
 
         if not hpi_filled:
-            # Still in HPI — force-fill the first empty HPI field
-            for stuck_field in HPI_FIELDS:
-                if getattr(result, stuck_field, None) is None:
-                    object.__setattr__(result, stuck_field, "not specified")
-                    print(f"[LoopGuard] Force-filled HPI '{stuck_field}' = 'not specified' to break repeat loop")
-                    new_missing = missing_from(result)
-                    if new_missing:
-                        object.__setattr__(result, "reply", f"Thank you. Now, could you tell me about {new_missing[0].replace('HPI:', '')}?")
-                    else:
-                        object.__setattr__(result, "reply", "Thank you — I have everything I need.")
-                    break
+            if not made_progress:
+                # Still in HPI and stuck — force-fill the first empty HPI field
+                for stuck_field in HPI_FIELDS:
+                    if getattr(result, stuck_field, None) is None:
+                        object.__setattr__(result, stuck_field, "not specified")
+                        print(f"[LoopGuard] Force-filled HPI '{stuck_field}' = 'not specified' to break repeat loop")
+                        break
+            
+            # Ensure we ask a new question to break the loop
+            new_missing = missing_from(result)
+            if new_missing:
+                object.__setattr__(result, "reply", f"Thank you. Now, could you tell me about {new_missing[0].replace('HPI:', '')}?")
+            else:
+                object.__setattr__(result, "reply", "Thank you — I have everything I need.")
         else:
-            # In ROS stage — force-fill the current ROS system with patient's last answer
-            patient_answer = ""
-            for m in reversed(msgs):
-                if m.get("role") == "user":
-                    patient_answer = m.get("content", "denied")
-                    break
-            patient_answer = patient_answer or "denied"
-
-            # Find which ROS system the LLM was asking about (from its repeated reply)
-            ros = dict(result.ros) if result.ros else {}
-            ros_label = f"patient_reported_{len(ros) + 1}"
-            ros[ros_label] = [patient_answer]
-            object.__setattr__(result, "ros", ros)
-            print(f"[LoopGuard] Force-filled ROS '{ros_label}' = ['{patient_answer}'] to break ROS repeat loop")
-
-            if len(ros) < ROS_REQUIRED:
+            # In ROS stage
+            if not made_progress:
+                print("[LoopGuard] LLM stuck in ROS without extracting data. Skipping system.")
+                
+            if len(result.ros) < ROS_REQUIRED:
                 object.__setattr__(result, "reply", f"Thank you. Are there any other symptoms you've been experiencing?")
             else:
                 object.__setattr__(result, "reply", "Thank you — I have everything I need.")

app/llm.py

@@ -43,6 +43,7 @@ OUTPUT FORMAT:
   "aggravating": "..." or null,
   "relieving": "..." or null,
   "ros": {"system_name": ["finding1", "finding2"], ...},
+  "ros_asked": ["system_name1"] (append any new system you ask about here to prevent repeating),
   "emergency": false,
   "reply": "Your single question"
 }"""
@@ -77,12 +78,15 @@ def build_state_context(current_json: str) -> str:
 
     # ROS
     ros = state.get("ros", {})
+    ros_asked = state.get("ros_asked", [])
     if ros:
         for sys_name, findings in ros.items():
             lines.append(f'  ✅ ros.{sys_name}: {findings}')
     ros_remaining = ROS_REQUIRED - len(ros)
     if ros_remaining > 0:
         lines.append(f"  ❌ ros: {ros_remaining} more system(s) needed")
+        if ros_asked:
+            lines.append(f"  ℹ️ Already asked about: {', '.join(ros_asked)} — DO NOT ask about these again")
     else:
         lines.append(f"  ✅ ros: all {ROS_REQUIRED} systems collected")
 
@@ -116,6 +120,7 @@ class CombinedOutput(BaseModel):
     aggravating: str | None = None
     relieving: str | None = None
     ros: dict[str, list[str]] = {}
+    ros_asked: list[str] = []
     emergency: bool = False
     reply: str = ""