Fix an issue where rename is not showing in role

state.py

@@ -120,17 +120,22 @@ def removeCategory(index):
     del st.session_state.categorySelect[index]
 
 
-def updateCategoryOptions():
-    """Store tokens ('fname: SPEAKER_##') in the global categorySelect lists."""
+def updateCategoryOptions(token_display_map=None):
+    """Store tokens ('fname: SPEAKER_##') in the global categorySelect lists.
+
+    token_display_map: dict {display_label -> raw_token} passed from ui.py.
+    Widget keys hold display labels; categorySelect must hold raw tokens.
+    """
     if st.session_state.resetResult:
         return
-    # Rebuild categorySelect from widget values, then sync widget keys back to
-    # match — this keeps the data model and the displayed selection in lockstep.
+    display_to_raw = token_display_map or {}
     for i, category in enumerate(st.session_state.categories):
         ms_key = f"multiselect_{category}"
-        new_val = list(st.session_state.get(ms_key, []))
-        st.session_state.categorySelect[i] = new_val
-        st.session_state[ms_key] = new_val
+        display_vals = list(st.session_state.get(ms_key, []))
+        # Translate display labels back to raw tokens for the data model
+        raw_vals = [display_to_raw.get(t, t) for t in display_vals]
+        st.session_state.categorySelect[i] = raw_vals
+        # Keep widget key as display labels (do not overwrite with raw)
     # Recompute unusedSpeakers for all files
     all_assigned_tokens = {
         token
@@ -198,11 +203,10 @@ def removeGlobalRename(index):
         _write_rename(token, "")
     st.session_state.pop(_global_rename_key(index), None)
     del st.session_state.globalRenames[index]
-    # Shift remaining widget keys down and sync them to their data model
+    # Shift remaining widget keys down — ui.py will re-sync them to display
+    # labels on the next render, so just clear them to force a clean re-seed.
     for i in range(index, len(st.session_state.globalRenames)):
-        st.session_state[_global_rename_key(i)] = list(
-            st.session_state.globalRenames[i]["speakers"]
-        )
+        st.session_state.pop(_global_rename_key(i), None)
 
 
 def apply_inline_rename(currFile, raw_sp, new_name):
@@ -228,27 +232,23 @@ def apply_inline_rename(currFile, raw_sp, new_name):
         st.toast(f"Reverted {raw_sp} to original label")
 
 
-def on_grename_change(idx):
+def on_grename_change(idx, token_display_map=None):
     """Callback for the sidebar rename multiselect at position idx.
 
-    Diffs old vs new speakers list:
-    - Newly added tokens → enforce exclusivity, write name into speakerRenames.
-    - Removed tokens → revert speakerRenames for those tokens.
-
-    Spurious-callback guard: Streamlit sometimes re-fires this callback with an
-    empty widget value when available_tokens changes (e.g. another entry just
-    claimed a token, shrinking options). We detect this by checking whether the
-    widget value went to empty while the data model still has speakers — if ALL
-    of the previous speakers are still valid options for this entry we treat the
-    empty report as a Streamlit glitch and restore the widget key from the data
-    model instead of acting on it.
+    token_display_map: dict {display_label -> raw_token} passed from ui.py.
+    Widget keys hold display labels; entry["speakers"] must hold raw tokens.
     """
     grkey = _global_rename_key(idx)
     entry = st.session_state.globalRenames[idx]
     name  = entry["name"]
 
-    prev     = list(entry["speakers"])   # current data-model state (ordered)
-    reported = list(st.session_state.get(grkey, []))
+    display_to_raw = token_display_map or {}
+    raw_to_display = {v: k for k, v in display_to_raw.items()}
+
+    prev     = list(entry["speakers"])   # raw tokens in data model
+    # Widget reports display labels — translate back to raw
+    reported_display = list(st.session_state.get(grkey, []))
+    reported = [display_to_raw.get(t, t) for t in reported_display]
 
     # Build the set of tokens that are legitimately available for this entry
     # right now (not claimed by any OTHER entry).
@@ -266,7 +266,8 @@ def on_grename_change(idx):
     if not reported and len(prev) > 1:
         all_still_valid = all(t not in other_claimed for t in prev)
         if all_still_valid:
-            st.session_state[grkey] = prev
+            # Restore widget key as display labels
+            st.session_state[grkey] = [raw_to_display.get(t, t) for t in prev]
             return
 
     prev_set = set(prev)
@@ -281,7 +282,8 @@ def on_grename_change(idx):
     # Do NOT pop the key — popping causes Streamlit to re-initialise the widget
     # to [] on the next render (because no `default=` is passed), erasing the
     # selection visually even though the data model is correct.
-    st.session_state[grkey] = list(entry["speakers"])
+    # Sync widget key as display labels
+    st.session_state[grkey] = [raw_to_display.get(t, t) for t in entry["speakers"]]
 
     # Enforce exclusivity and write renames for newly added tokens
     for token in added:
@@ -290,8 +292,9 @@ def on_grename_change(idx):
                 continue
             if token in other_entry["speakers"]:
                 other_entry["speakers"].remove(token)
-                # Sync the other entry's widget key too (same reason — don't pop)
-                st.session_state[_global_rename_key(other_idx)] = list(other_entry["speakers"])
+                st.session_state[_global_rename_key(other_idx)] = [
+                    raw_to_display.get(t, t) for t in other_entry["speakers"]
+                ]
                 _write_rename(token, "")
         _write_rename(token, name)