Fix a bug with conflicted speakers in the same rename

app.py

@@ -271,13 +271,26 @@ try:
         if fn in st.session_state.results and len(st.session_state.results[fn]) == 2
         for sp in st.session_state.results[fn][0].labels()
     ]
-    # Map display label -> raw token so ui.py can translate back after selection
-    token_display_map = {
-        f"{fn}: {get_display_name(sp, fn)}": f"{fn}: {sp}"
-        for fn in st.session_state.file_names
-        if fn in st.session_state.results and len(st.session_state.results[fn]) == 2
-        for sp in st.session_state.results[fn][0].labels()
-    }
+    # Map display label -> raw token so ui.py can translate back after selection.
+    # Build carefully to avoid key collisions: if two speakers in the same file
+    # share a display name, append the raw ID to disambiguate both entries.
+    token_display_map = {}
+    for fn in st.session_state.file_names:
+        if not (fn in st.session_state.results and len(st.session_state.results[fn]) == 2):
+            continue
+        # First pass: collect display labels per file to detect duplicates
+        sp_labels = {sp: f"{fn}: {get_display_name(sp, fn)}"
+                     for sp in st.session_state.results[fn][0].labels()}
+        label_counts = {}
+        for disp in sp_labels.values():
+            label_counts[disp] = label_counts.get(disp, 0) + 1
+        # Second pass: build map, disambiguating where needed
+        for sp, disp in sp_labels.items():
+            raw = f"{fn}: {sp}"
+            if label_counts[disp] > 1:
+                token_display_map[f"{fn}: {get_display_name(sp, fn)} ({sp})"] = raw
+            else:
+                token_display_map[disp] = raw
     display_speaker_tokens = list(token_display_map.keys())
 
     # -----------------------------------------------------------------------