test(contributors): casefold collision key, drop stale allowlist, cover same-login case

Follow-up for salvaged #88472 (+ #100055 / #99995 / #88998 intent):
- add_contributor.py compares filenames with str.casefold(), the same key
  scripts/check-case-collisions.py uses repo-wide, so non-ASCII folds
  (ß ~ ss) are caught the way macOS/Windows fold them.
- The KNOWN_CASE_CONFLICTS allowlist is gone: the historical
  agent@Agents-Mac-mini.local pair was removed on main (fcdae2cf0b), so the
  repo-wide test asserts zero collisions.
- New tests: same-login different-spelling is still refused (the filename
  pair is the problem, not the login) and the exact spelling stays
  idempotent; casefold vs lower coverage.

Co-authored-by: alfred-amanda <288490622+alfred-amanda@users.noreply.github.com>

scripts/add_contributor.py

@@ -64,9 +64,11 @@ def _case_collision(email: str) -> str | None:
     if not EMAILS_DIR.is_dir():
         return None
 
-    folded = email.lower()
+    # casefold (not lower) matches how macOS/Windows fold non-ASCII text —
+    # same key scripts/check-case-collisions.py uses repo-wide.
+    folded = email.casefold()
     for entry in EMAILS_DIR.iterdir():
-        if entry.name != email and entry.name.lower() == folded:
+        if entry.name != email and entry.name.casefold() == folded:
             return entry.name
     return None
 

tests/scripts/test_contributor_map.py

@@ -125,35 +125,25 @@ def test_cli_entrypoint_end_to_end(tmp_path):
 # then reports the other as modified in a FRESH clone, permanently: the repo can
 # never be checked out clean on those platforms.
 #
-# This pair is a real conflict in the tree today and needs a maintainer to say
-# which login is correct -- they point at different logins, so deleting either
-# silently reassigns commits. It is pinned here so the breakage is visible and,
-# more importantly, so it cannot spread.
-KNOWN_CASE_CONFLICTS = {
-    frozenset(
-        {
-            "agent@Agents-Mac-mini.local",
-            "agent@agents-Mac-mini.local",
-        }
-    )
-}
-
+# The historical agent@Agents-Mac-mini.local / agent@agents-Mac-mini.local pair
+# was removed from the tree (fcdae2cf0b), so there is no allowlist: any pair
+# is a regression. scripts/check-case-collisions.py enforces the same
+# invariant repo-wide in CI; this test keeps it visible next to the writer.
 EMAILS_DIR = REPO_ROOT / "contributors" / "emails"
 
 
-def test_no_new_case_insensitive_mapping_collisions():
+def test_no_case_insensitive_mapping_collisions():
     groups: dict[str, set[str]] = {}
     for entry in EMAILS_DIR.iterdir():
         if entry.is_file():
-            groups.setdefault(entry.name.lower(), set()).add(entry.name)
+            groups.setdefault(entry.name.casefold(), set()).add(entry.name)
 
     collisions = {frozenset(names) for names in groups.values() if len(names) > 1}
-    unexpected = collisions - KNOWN_CASE_CONFLICTS
 
-    assert not unexpected, (
+    assert not collisions, (
         "contributor mappings differing only in case cannot coexist on "
         "case-insensitive filesystems (Windows, default macOS) — a fresh clone "
-        f"there is permanently dirty: {sorted(sorted(c) for c in unexpected)}"
+        f"there is permanently dirty: {sorted(sorted(c) for c in collisions)}"
     )
 
 
@@ -168,3 +158,24 @@ def test_add_contributor_refuses_a_case_collision(tmp_path, monkeypatch):
 
     assert mod.add_contributor("agent@example-host.local", "otherperson") == 1
     assert not (d / "agent@example-host.local").exists()
+
+
+def test_add_contributor_refuses_case_collision_even_for_same_login(emails_dir, capsys):
+    # Same login, different spelling: still refused — the problem is the
+    # filename pair, not the login. The exact spelling is what's "present".
+    emails_dir.mkdir(parents=True)
+    (emails_dir / "Foo@Example.com").write_text("foouser\n")
+
+    assert add_contributor("foo@example.com", "foouser") == 1
+    assert "Foo@Example.com" in capsys.readouterr().err
+    assert sorted(p.name for p in emails_dir.iterdir()) == ["Foo@Example.com"]
+    # Exact-case re-add is the ordinary idempotent path.
+    assert add_contributor("Foo@Example.com", "foouser") == 0
+
+
+def test_case_collision_uses_casefold(emails_dir):
+    # casefold, not lower: matches how macOS/Windows fold non-ASCII (ß ~ ss).
+    emails_dir.mkdir(parents=True)
+    (emails_dir / "strasse@example.com").write_text("someone\n")
+    assert add_contributor("STRASSE@example.com", "someone") == 1
+    assert add_contributor("straße@example.com", "someone") == 1