Fix multi-skill validation and output mismatch bugs

- Changed elif to if for skill validation in both builder and chat panels
- Fixed empiric therapy early return to match 5 expected outputs in builder panel
- Now supports agents with multiple skills (deescalation + empiric therapy, etc.)
- All skill inputs are properly validated and prepended when multiple skills selected

app.py

@@ -775,7 +775,7 @@ def build_ui():
                     # Only prepend if at least one field is non-empty
                     if any(user_vars[k] for k in var_names):
                         user_text = f"[DEESCALATION_TOOL_INPUT] {json.dumps(user_vars)}\n" + user_text
-                elif "alert_prolonged_antibiotic_use" in skills:
+                if "alert_prolonged_antibiotic_use" in skills:
                     var_names = ["site_of_infection", "risk_of_biofilm", "current_response", "creatinine_clearance", "severity_of_infection", "known_allergies"]
                     user_vars = {
                         "site_of_infection": stewardship_site,
@@ -791,7 +791,7 @@ def build_ui():
                             user_vars[k] = extracted.get(k) or ""
                     if any(user_vars[k] for k in var_names):
                         user_text = f"[ALERT_PROLONGED_ABX_INPUT] {json.dumps(user_vars)}\n" + user_text
-                elif "recommend_empiric_therapy" in skills:
+                if "recommend_empiric_therapy" in skills:
                     # Remove 'known_allergies' as a separate required field (it's covered by 'allergies')
                     var_names = [
                         "age", "allergies", "labs", "culture", "meds", "site_of_infection",
@@ -819,7 +819,9 @@ def build_ui():
                         prompt = f"Please provide the following required information for empiric therapy: {', '.join(missing)}."
                         # Show this as an assistant message and do not call the tool
                         history.append(["", prompt])
-                        return history, histories, ""
+                        updated_histories = histories.copy()
+                        updated_histories[agent_name] = history
+                        return history, updated_histories, "", "", ""  # 5 outputs: chatbot, histories, textbox, invocation_log, challenger_md
                     # All required fields present, prepend tool input
                     user_text = f"[EMPIRIC_THERAPY_INPUT] {json.dumps(user_vars)}\n" + user_text
             # Use the same chat handling logic, but ensure the builder_chatbot is updated and history is preserved
@@ -1951,7 +1953,7 @@ def build_ui():
                     if any(user_vars[k] for k in var_names):
                         user_text = f"[DEESCALATION_TOOL_INPUT] {json.dumps(user_vars)}\n" + user_text
                 # Alert prolonged antibiotic use tool
-                elif "alert_prolonged_antibiotic_use" in skills:
+                if "alert_prolonged_antibiotic_use" in skills:
                     var_names = ["site_of_infection", "risk_of_biofilm", "current_response", "creatinine_clearance", "severity_of_infection", "known_allergies"]
                     user_vars = {
                         "site_of_infection": stewardship_site,
@@ -1968,7 +1970,7 @@ def build_ui():
                     if any(user_vars[k] for k in var_names):
                         user_text = f"[ALERT_PROLONGED_ABX_INPUT] {json.dumps(user_vars)}\n" + user_text
                 # Empiric therapy tool
-                elif "recommend_empiric_therapy" in skills:
+                if "recommend_empiric_therapy" in skills:
                     var_names = [
                         "age", "allergies", "labs", "culture", "meds", "site_of_infection",
                         "risk_of_biofilm", "current_response", "creatinine_clearance", "severity_of_infection"
@@ -2000,7 +2002,7 @@ def build_ui():
                     if any(user_vars[k] for k in var_names):
                         user_text = f"[EMPIRIC_THERAPY_INPUT] {json.dumps(user_vars)}\n" + user_text
                 # Clinical assessment tools (history_taking, retrieve_guidelines, explain_in_layman_language)
-                elif "history_taking" in skills or "retrieve_guidelines" in skills or "explain_in_layman_language" in skills:
+                if "history_taking" in skills or "retrieve_guidelines" in skills or "explain_in_layman_language" in skills:
                     var_names = [
                         "chief_complaint", "history_present_illness", "past_medical_history", "medications",
                         "allergies", "social_history", "vital_signs", "physical_exam", "lab_results", "imaging_results"
@@ -2025,7 +2027,7 @@ def build_ui():
                     if any(user_vars[k] for k in var_names):
                         user_text = f"[CLINICAL_ASSESSMENT_INPUT] {json.dumps(user_vars)}\n" + user_text
                 # IPC tools (IPC_reporting, NHSN_criteria_evaluator, recommend_isolation_precautions)
-                elif "IPC_reporting" in skills or "NHSN_criteria_evaluator" in skills or "recommend_isolation_precautions" in skills:
+                if "IPC_reporting" in skills or "NHSN_criteria_evaluator" in skills or "recommend_isolation_precautions" in skills:
                     var_names = [
                         "facility_name", "location_unit", "infection_type", "onset_date", "device_days",
                         "pathogen", "resistance_pattern", "isolation_status", "compliance_issues"