P0-R5-R3-C event-driven Research Design state fix

app.py

@@ -505,16 +505,16 @@ def _uploaded_material_descriptors() -> list[dict[str, str]]:
 
 
 def _method_intent_signature() -> str:
-    """Identity for the manual Research Design control and current paper intent.
+    """Identity of the current paper intent for launch-time stale-state checks.
 
-    A new task defaults to Qualitative Research. If the user manually selects
-    Survey-Based Quantitative Research, changing the Title or Keywords resets
-    the design to Qualitative Research so the workflow and recommended template
-    return to the qualitative/ASQ lane together. Uploaded materials do not reset
-    the selection.
+    Title/Keywords remain part of the launch signature so a pending generation
+    cannot start against a different paper intent. Research Design reset itself
+    is event-driven by the Title/Keywords widgets rather than by every Streamlit
+    rerun; unrelated product-tier, word-count, and button reruns therefore never
+    change the selected design. Uploaded materials do not reset the selection.
     """
     payload = {
-        "research_design_control": "manual-default-qualitative-v2",
+        "research_design_control": "manual-default-qualitative-v3-event-reset",
         "topic": str(st.session_state.get("sp_topic") or DEFAULT_TOPIC).strip(),
         "keywords": str(st.session_state.get("sp_keywords") or DEFAULT_KEYWORDS).strip(),
     }
@@ -523,6 +523,21 @@ def _method_intent_signature() -> str:
     ).hexdigest()
 
 
+def _reset_research_design_after_intent_edit() -> None:
+    """Reset a not-yet-started paper to the qualitative default after intent edit.
+
+    Streamlit invokes this callback only when the Title or Keywords widget
+    actually changes. It is intentionally not attached to product tier, target
+    words, research materials, or the Generate button.
+    """
+    st.session_state["sp_method_selector"] = "qualitative"
+    st.session_state["sp_method_confirmation"] = ""
+    st.session_state["sp_method_confirmation_signature"] = ""
+    st.session_state["sp_method_selector_signature"] = ""
+    st.session_state["sp_pending_launch"] = None
+    st.session_state["run_mode"] = "asq"
+
+
 def _current_method_preflight(*, confirmed_method_family: str | None = None) -> tuple[dict, str]:
     signature = _method_intent_signature()
     stored_confirmation = str(st.session_state.get("sp_method_confirmation") or "").strip()
@@ -1479,8 +1494,20 @@ def render_workspace_controls(user):
             st.rerun()
         st.markdown("---")
 
-    st.text_input(tr(lang_code, "topic_label"), value=DEFAULT_TOPIC, disabled=active, key="sp_topic")
-    st.text_input(tr(lang_code, "keywords_label"), value=DEFAULT_KEYWORDS, disabled=active, key="sp_keywords")
+    st.text_input(
+        tr(lang_code, "topic_label"),
+        value=DEFAULT_TOPIC,
+        disabled=active,
+        key="sp_topic",
+        on_change=_reset_research_design_after_intent_edit,
+    )
+    st.text_input(
+        tr(lang_code, "keywords_label"),
+        value=DEFAULT_KEYWORDS,
+        disabled=active,
+        key="sp_keywords",
+        on_change=_reset_research_design_after_intent_edit,
+    )
 
     # U1-R2 unified research workspace: academic intent/materials first, then
     # product/length controls. Legacy AMJ/ASQ remains internal policy routing.
@@ -1521,24 +1548,15 @@ def render_workspace_controls(user):
         method_signature = ""
     else:
         # SmartPaper intentionally supports only two reader-visible research
-        # designs. New tasks default to qualitative research. The user may
-        # adjust the design manually. Changing Title or Keywords resets a manual
-        # survey selection to qualitative; uploaded materials do not reset it.
+        # designs. New tasks default to qualitative research. Title/Keywords
+        # changes reset the selector through their explicit on_change callback;
+        # unrelated Streamlit reruns must preserve the user's manual selection.
         method_signature = _method_intent_signature()
-        stored = str(st.session_state.get("sp_method_confirmation") or "").strip().casefold()
-        stored_sig = str(st.session_state.get("sp_method_confirmation_signature") or "").strip()
-        selected_default = (
-            stored if stored_sig == method_signature and stored in METHOD_FAMILIES else "qualitative"
-        )
-
-        selector_sig = str(st.session_state.get("sp_method_selector_signature") or "").strip()
-        if selector_sig != method_signature:
-            st.session_state["sp_method_confirmation"] = ""
-            st.session_state["sp_method_confirmation_signature"] = ""
-            st.session_state["sp_method_selector"] = "qualitative"
-            st.session_state["sp_method_selector_signature"] = method_signature
+        selected_default = str(
+            st.session_state.get("sp_method_selector") or "qualitative"
+        ).strip().casefold()
+        if selected_default not in METHOD_FAMILIES:
             selected_default = "qualitative"
-        elif str(st.session_state.get("sp_method_selector") or "").strip().casefold() not in METHOD_FAMILIES:
             st.session_state["sp_method_selector"] = selected_default
 
         selected = st.selectbox(