Fix Rename Speaker and Rename Multi Speaker bug

state.py

@@ -158,6 +158,23 @@ def applyGlobalRenames():
                 st.session_state[f"rename_{curr}_{sp}"] = saved.get(sp, "")
 
 
+def enforceGlobalRenameExclusivity(changed_idx):
+    """Ensure a token assigned to entry[changed_idx] is removed from all others.
+
+    Called by the sidebar multiselect on_change so that picking a speaker for
+    one name automatically unassigns it from any previously-holding name.
+    """
+    changed_tokens = set(st.session_state.globalRenames[changed_idx]["speakers"])
+    for idx, entry in enumerate(st.session_state.globalRenames):
+        if idx == changed_idx:
+            continue
+        new_speakers = [t for t in entry["speakers"] if t not in changed_tokens]
+        if new_speakers != entry["speakers"]:
+            entry["speakers"] = new_speakers
+            st.session_state[_global_rename_key(idx)] = new_speakers
+    applyGlobalRenames()
+
+
 def addGlobalRename():
     new_name = st.session_state.globalRenameInput.strip()
     if not new_name:
@@ -188,26 +205,31 @@ def apply_inline_rename(currFile, raw_sp, new_name):
     new_name = new_name.strip()
     token = f"{currFile}: {raw_sp}"
 
+    # Always remove this token from every existing entry first so it can't
+    # be claimed by more than one name at the same time.
+    for entry in st.session_state.globalRenames:
+        if token in entry["speakers"]:
+            entry["speakers"].remove(token)
+            # Keep the widget key in sync
+            idx = st.session_state.globalRenames.index(entry)
+            st.session_state[_global_rename_key(idx)] = list(entry["speakers"])
+
     if new_name:
         # Write into speakerRenames immediately
         st.session_state.speakerRenames.setdefault(currFile, {})[raw_sp] = new_name
         # Find an existing globalRenames entry for this name, or create one
-        for entry in st.session_state.globalRenames:
+        for idx, entry in enumerate(st.session_state.globalRenames):
             if entry["name"] == new_name:
-                if token not in entry["speakers"]:
-                    entry["speakers"].append(token)
+                entry["speakers"].append(token)
+                st.session_state[_global_rename_key(idx)] = list(entry["speakers"])
                 return
         # No existing entry — create a new one
         idx = len(st.session_state.globalRenames)
         st.session_state.globalRenames.append({"name": new_name, "speakers": [token]})
         st.session_state[_global_rename_key(idx)] = [token]
     else:
-        # Empty name — clear the rename for this speaker
+        # Empty name — clear the rename for this speaker (token already removed above)
         st.session_state.speakerRenames.setdefault(currFile, {}).pop(raw_sp, None)
-        # Remove the token from any globalRenames entry
-        for entry in st.session_state.globalRenames:
-            if token in entry["speakers"]:
-                entry["speakers"].remove(token)
 
 
 # ---------------------------------------------------------------------------