Clean up outercourse prompt wording

prompt_builder.py

@@ -1044,19 +1044,34 @@ def _outercourse_axis_values_for_position(values: list[Any], position: str, axis
     def value_text(value: Any) -> str:
         return _entry_text(value).lower()
 
-    def filtered(terms: tuple[str, ...]) -> list[Any]:
-        matches = [value for value in values if any(term in value_text(value) for term in terms)]
+    def filtered(terms: tuple[str, ...], excluded_terms: tuple[str, ...] = ()) -> list[Any]:
+        matches = [
+            value
+            for value in values
+            if any(term in value_text(value) for term in terms)
+            and not any(term in value_text(value) for term in excluded_terms)
+        ]
         return matches or values
 
     if any(term in position_text for term in ("boobjob", "titjob", "breast-sex", "breast sex")):
         by_axis = {
-            "contact_detail": ("compressed", "glans", "shaft", "skin", "fingers"),
+            "contact_detail": ("compressed", "glans", "breast", "breasts", "soft tissue", "skin visibly"),
             "hand_detail": ("breast", "breasts", "fingers"),
             "texture_detail": ("compression", "soft flesh", "skin", "flesh", "asymmetry"),
             "visibility": ("breast", "breasts", "glans", "shaft"),
             "body_contact": ("torso", "body angled", "shoulders", "hips"),
         }
-        return filtered(by_axis.get(axis_name, ("breast", "breasts", "shaft")))
+        excluded_by_axis = {
+            "contact_detail": ("hand wrapped", "fingers and palm", "soles", "toes", "balls", "tongue"),
+            "hand_detail": ("base of the penis", "penis shaft", "balls", "thigh", "ankles", "stroking"),
+            "texture_detail": ("toes", "soles", "tongue"),
+            "visibility": ("balls", "soles", "toes", "hand"),
+            "body_contact": ("head tucked", "face directly", "base of the penis"),
+        }
+        return filtered(
+            by_axis.get(axis_name, ("breast", "breasts", "shaft")),
+            excluded_by_axis.get(axis_name, ()),
+        )
     if any(term in position_text for term in ("testicle", "balls")):
         by_axis = {
             "contact_detail": ("balls", "lips", "tongue", "wet"),
@@ -3581,6 +3596,50 @@ def _character_expression_entries(
     return expressions
 
 
+def _sanitize_character_expression_text_for_action(
+    expression_text: str,
+    role_graph: Any,
+    item: Any,
+    axis_values: Any = None,
+) -> str:
+    text = str(expression_text or "").strip()
+    if not text:
+        return ""
+    context = " ".join(
+        str(part or "").lower()
+        for part in (
+            role_graph,
+            item,
+            *((axis_values or {}).values() if isinstance(axis_values, dict) else ()),
+        )
+    )
+    woman_active_outercourse = (
+        re.search(r"\bwoman [a-z]\b", context)
+        and re.search(r"\bman [a-z]\b", context)
+        and any(
+            term in context
+            for term in (
+                "boobjob",
+                "titjob",
+                "breast sex",
+                "breasts tightly",
+                "testicle",
+                "balls-licking",
+                "balls licking",
+                "penis-licking",
+                "penis licking",
+                "handjob",
+                "hand job",
+                "footjob",
+            )
+        )
+    )
+    clauses = [clause.strip() for clause in text.split(";") if clause.strip()]
+    if woman_active_outercourse:
+        clauses = [clause for clause in clauses if not re.match(r"^Man [A-Z] has\b", clause)]
+    return "; ".join(clauses)
+
+
 def _descriptor_detail_for_subject(subject: Any, descriptor_detail: Any) -> str:
     detail = _normalize_descriptor_detail(descriptor_detail)
     if detail != "auto":
@@ -5136,8 +5195,8 @@ def _role_graph(
                     "both hands lifting and pressing her breasts tightly around the POV viewer's penis shaft while the glans sits just below her lips."
                 )
             return (
-                f"{man} sits with legs apart while {woman} kneels between his open thighs with her torso bent forward over his pelvis and shoulders low, "
-                f"both hands lifting and pressing her breasts tightly around {man}'s penis shaft while the glans sits just below her lips."
+                f"{woman} kneels between {man}'s open thighs with her torso bent forward over his pelvis and shoulders low while {man} sits with legs apart, "
+                f"{woman}'s hands lifting and pressing her breasts tightly around {man}'s penis shaft while the glans sits just below her lips."
             )
         if any(term in text for term in ("testicle", "balls-licking", "balls licking", "balls and mouth", "balls held")):
             if man_is_pov:
@@ -5840,6 +5899,13 @@ def _build_custom_row(
             expression_phase,
         )
         character_expression_text = "; ".join(character_expressions)
+        character_expression_text = _sanitize_character_expression_text_for_action(
+            character_expression_text,
+            source_role_graph,
+            item,
+            item_axis_values,
+        )
+        character_expressions = [part.strip() for part in character_expression_text.split(";") if part.strip()]
         if character_expression_text:
             expression = character_expression_text
     source_composition = _choose_text(