Update ui.py

ui.py

@@ -62,17 +62,20 @@ def render_categories_sidebar(all_speaker_tokens):
     )
     st.sidebar.divider()
 
-    # Tokens already claimed by any role, for exclusivity filtering
+    for i, category in enumerate(st.session_state.categories):
+        ms_key = f"multiselect_{category}"
+        if ms_key not in st.session_state:
+            st.session_state[ms_key] = list(st.session_state.categorySelect[i]) if i < len(st.session_state.categorySelect) else []
+
+    # Build claimed set from widget keys (source of truth for what's displayed)
     all_claimed = {
         token
-        for tokens in st.session_state.categorySelect
-        for token in tokens
+        for i, category in enumerate(st.session_state.categories)
+        for token in st.session_state.get(f"multiselect_{category}", [])
     }
 
     for i, category in enumerate(st.session_state.categories):
         ms_key = f"multiselect_{category}"
-        if ms_key not in st.session_state:
-            st.session_state[ms_key] = list(st.session_state.categorySelect[i]) if i < len(st.session_state.categorySelect) else []
         label_col, trash_col = st.sidebar.columns([5, 1])
         label_col.markdown(f"**{category}**")
         trash_col.button(
@@ -80,7 +83,7 @@ def render_categories_sidebar(all_speaker_tokens):
             on_click=removeCategory, args=(i,),
             help=f"Remove {category}",
         )
-        this_role_tokens = set(st.session_state.categorySelect[i]) if i < len(st.session_state.categorySelect) else set()
+        this_role_tokens = set(st.session_state.get(ms_key, []))
         available_tokens = [
             t for t in all_speaker_tokens
             if t not in all_claimed or t in this_role_tokens
@@ -111,16 +114,17 @@ def render_rename_sidebar(currFile, speakerNames, all_speaker_tokens):
     st.sidebar.divider()
 
     def _on_grename_change(idx):
-        new_val = list(st.session_state[_global_rename_key(idx)])
-        print(f"[DEBUG _on_grename_change] idx={idx} name={st.session_state.globalRenames[idx]['name']} new_val={new_val}")
-        st.session_state.globalRenames[idx]["speakers"] = new_val
+        st.session_state.globalRenames[idx]["speakers"] = list(
+            st.session_state[_global_rename_key(idx)]
+        )
         enforceGlobalRenameExclusivity(idx)
 
-    # Build a set of every token already claimed by some entry, for fast lookup
+    # Build claimed set from widget keys (not entry["speakers"] data) so it
+    # matches exactly what Streamlit is actually displaying as selected.
     all_claimed = {
         token
-        for e in st.session_state.globalRenames
-        for token in e["speakers"]
+        for i, e in enumerate(st.session_state.globalRenames)
+        for token in st.session_state.get(_global_rename_key(i), e["speakers"])
     }
 
     for idx, entry in enumerate(st.session_state.globalRenames):
@@ -134,14 +138,15 @@ def render_rename_sidebar(currFile, speakerNames, all_speaker_tokens):
             on_click=removeGlobalRename, args=(idx,),
             help=f"Remove '{entry['name']}'",
         )
-        # Options = tokens owned by this entry + tokens not claimed by anyone
-        this_entry_tokens = set(entry["speakers"])
+        # Use the widget's current value (not entry["speakers"]) as this entry's
+        # owned tokens — they can drift, and the widget value is what Streamlit
+        # actually displays. This prevents Streamlit silently dropping selections
+        # when available_tokens is computed from stale entry["speakers"] data.
+        this_entry_tokens = set(st.session_state.get(grkey, entry["speakers"]))
         available_tokens = [
             t for t in all_speaker_tokens
             if t not in all_claimed or t in this_entry_tokens
         ]
-        current_val = st.session_state.get(grkey, "NOT SET")
-        print(f"[DEBUG render] {entry['name']}: entry.speakers={entry['speakers']} grkey_val={current_val} available={available_tokens}")
         st.sidebar.multiselect(
             f"Speakers for {entry['name']}", options=available_tokens,
             key=grkey, on_change=_on_grename_change, args=(idx,),