Fix: scatter bubble click now correctly opens model card

- Read scatter selection from session_state before st.plotly_chart (on_select='rerun'
  triggers an immediate rerun, so post-chart code never runs in the same cycle)
- Add selection_source tracking ('scatter' | 'grid' | None) so grid's else-branch
  no longer clears selected_model when the scatter plot is the selection owner
- Guard grid deselect: only clear selected_model when selection_source == 'grid'
- Reset selection_source in profile _close() alongside the other session state keys

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: erwardenaar

app/components/grid.py

@@ -81,6 +81,11 @@ def render_grid(filtered: list[dict]) -> None:
         row_idx = selection.selection.rows[0]
         if row_idx < len(display_df):
             st.session_state.selected_model = display_df.iloc[row_idx]["name"]
+            st.session_state.selection_source = "grid"
     else:
-        # Row was deselected — close the profile card.
-        st.session_state.selected_model = None
+        # Only close the profile card if the grid was the component that opened
+        # it. If the source was the scatter plot, leave selected_model alone —
+        # the grid has no highlighted row in that case, but that is expected.
+        if st.session_state.get("selection_source") == "grid":
+            st.session_state.selected_model = None
+            st.session_state.selection_source = None

app/components/profile.py

@@ -26,6 +26,7 @@ def _close() -> None:
     st.session_state.selected_model = None
     st.session_state.pop("grid", None)
     st.session_state.pop("scatter", None)
+    st.session_state.pop("selection_source", None)
     st.rerun()
 
 

app/components/scatter.py

@@ -180,22 +180,24 @@ def render_scatter(filtered: list[dict]) -> None:
     selected = st.session_state.get("selected_model")
     fig = _build_figure(df, x_axis, y_axis, selected)
 
-    event = st.plotly_chart(
-        fig,
-        width="stretch",
-        on_select="rerun",
-        key="scatter",
-    )
-
-    # Extract the clicked model name from the event.
+    # Handle click from the PREVIOUS rerun cycle.
+    # on_select='rerun' triggers a full rerun immediately, so any code after
+    # st.plotly_chart never executes in the same cycle the click occurred.
+    # Reading from session_state here (before the chart call) captures the
+    # selection that was stored during that previous cycle.
     # customdata[0] is the first element of the custom_data=["name"] list —
     # more reliable than "hovertext", which has changed key names across
     # Plotly/Streamlit minor versions.
-    if event and event.selection and event.selection.points:
-        point = event.selection.points[0]
+    prev = st.session_state.get("scatter")
+    if prev and prev.selection and prev.selection.points:
+        point = prev.selection.points[0]
         name = (point.get("customdata") or [None])[0] or point.get("hovertext")
-        if name:
+        if name and name != st.session_state.get("selected_model"):
             st.session_state.selected_model = name
+            st.session_state.selection_source = "scatter"
+            st.rerun()
+
+    st.plotly_chart(fig, width="stretch", on_select="rerun", key="scatter")
 
     note = "Bubble area encodes model size; models over 100 B are capped. Use fullscreen for detail."
     if x_axis == "training_tokens_b" or y_axis == "training_tokens_b":