Fix an issue where rename is not showing in role

ui.py

@@ -51,8 +51,18 @@ def render_chart(fig, tab, pdf_path, svg_path, pdf_name, svg_name, pdf_key, svg_
 # Sidebar — categories section
 # ---------------------------------------------------------------------------
 
-def render_role_sidebar(all_speaker_tokens):
-    """Render cross-file role multiselects using speaker tokens, matching the rename sidebar pattern."""
+def render_role_sidebar(display_speaker_tokens, token_display_map):
+    """Render cross-file role multiselects.
+
+    display_speaker_tokens : list of display strings shown in the dropdown
+                             e.g. ["file: John", "file: SPEAKER_01"]
+    token_display_map      : dict {display_label -> raw_token}
+                             e.g. {"file: John": "file: SPEAKER_00"}
+    The data model (categorySelect) always stores raw tokens; this function
+    converts between display labels and raw tokens at the boundary.
+    """
+    raw_to_display = {v: k for k, v in token_display_map.items()}
+
     st.sidebar.subheader("Add Speaker's Role")
     st.sidebar.markdown(
         "<p style='font-size:0.85rem; color:gray; margin-bottom:2px;'>"
@@ -60,15 +70,15 @@ def render_role_sidebar(all_speaker_tokens):
         "by typing in the \"Add custom role\" textbox.</p>",
         unsafe_allow_html=True,
     )
-    #st.sidebar.divider()
     st.sidebar.text(" ")
 
     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 []
+        # Always sync widget key from data model, converting raw -> display
+        raw_vals = st.session_state.categorySelect[i] if i < len(st.session_state.categorySelect) else []
+        st.session_state[ms_key] = [raw_to_display.get(t, t) for t in raw_vals]
 
-    # Build claimed set from widget keys (source of truth for what's displayed)
+    # Build claimed set (display labels) from widget keys
     all_claimed = {
         token
         for i, category in enumerate(st.session_state.categories)
@@ -84,15 +94,17 @@ def render_role_sidebar(all_speaker_tokens):
             on_click=removeCategory, args=(i,),
             help=f"Remove {category}",
         )
-        this_role_tokens = set(st.session_state.get(ms_key, []))
+        this_role_display = 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
+            t for t in display_speaker_tokens
+            if t not in all_claimed or t in this_role_display
         ]
         st.sidebar.multiselect(
             category, available_tokens,
             default=list(st.session_state.get(ms_key, [])),
-            key=ms_key, on_change=updateCategoryOptions,
+            key=ms_key,
+            on_change=updateCategoryOptions,
+            args=(token_display_map,),
             label_visibility="collapsed",
         )
     st.sidebar.text_input("Add custom role", key="categoryInput", on_change=addCategory)
@@ -102,8 +114,15 @@ def render_role_sidebar(all_speaker_tokens):
 # Sidebar — rename speakers section
 # ---------------------------------------------------------------------------
 
-def render_rename_sidebar(currFile, speakerNames, all_speaker_tokens):
-    """Render the full Rename Multiple Speakers sidebar section."""
+def render_rename_sidebar(currFile, speakerNames, display_speaker_tokens, token_display_map):
+    """Render the full Rename Multiple Speakers sidebar section.
+
+    display_speaker_tokens : list of display strings shown in the dropdown
+    token_display_map      : dict {display_label -> raw_token}
+    The data model (entry["speakers"]) always stores raw tokens.
+    """
+    raw_to_display = {v: k for k, v in token_display_map.items()}
+
     st.sidebar.divider()
     st.sidebar.subheader("Rename Multiple Speakers")
     st.sidebar.markdown(
@@ -113,20 +132,19 @@ def render_rename_sidebar(currFile, speakerNames, all_speaker_tokens):
         unsafe_allow_html=True,
     )
 
-    #st.sidebar.divider()
     st.sidebar.text(" ")
 
-    # Build claimed set from the data model (entry["speakers"]) as canonical truth.
+    # Build claimed set (display labels) from the data model
     all_claimed = {
-        token
+        raw_to_display.get(token, token)
         for entry in st.session_state.globalRenames
         for token in entry["speakers"]
     }
 
     for idx, entry in enumerate(st.session_state.globalRenames):
         grkey = _global_rename_key(idx)
-        if grkey not in st.session_state:
-            st.session_state[grkey] = list(entry["speakers"])
+        # Always sync widget key from data model, converting raw -> display
+        st.session_state[grkey] = [raw_to_display.get(t, t) for t in entry["speakers"]]
         label_col, trash_col = st.sidebar.columns([5, 1])
         label_col.markdown(f"**{entry['name']}**")
         trash_col.button(
@@ -134,15 +152,17 @@ def render_rename_sidebar(currFile, speakerNames, all_speaker_tokens):
             on_click=removeGlobalRename, args=(idx,),
             help=f"Remove '{entry['name']}'",
         )
-        this_entry_tokens = set(entry["speakers"])
+        this_entry_display = set(st.session_state[grkey])
         available_tokens = [
-            t for t in all_speaker_tokens
-            if t not in all_claimed or t in this_entry_tokens
+            t for t in display_speaker_tokens
+            if t not in all_claimed or t in this_entry_display
         ]
         st.sidebar.multiselect(
             f"Speakers for {entry['name']}", options=available_tokens,
             default=list(st.session_state.get(grkey, [])),
-            key=grkey, on_change=on_grename_change, args=(idx,),
+            key=grkey,
+            on_change=on_grename_change,
+            args=(idx, token_display_map),
             label_visibility="collapsed",
         )