GEN-3h: Breeder bracket-notation display + E-locus e-vor-e[f] Sortierung

- genotype.ts: toDisplayString zeigt ef→e[f], cchm→c[chm], ch→c[h] (Display-only;
  Storage-Contract unverändert). E-Locus Display-Rank E>e>ef: {ef,e} Paar
  rendert als ee[f] statt e[f]e (Züchterin-Konvention, Julian-Feedback).
- genotype.ts: normalizeToken akzeptiert Klammer-Eingabe (e[f], c[chm], c[h],
  [-]) → interne Symbole; vollständiger Round-Trip Display→Parse.
- genetics.test.ts: Katalog-Regex auf [A-Za-z[\]?-]+ erweitert; GEN-3h
  Notation-Fixtures (C/Zuleika/Milka-Orakel, Klammer-Round-Trip, E-Sortierung).
- colorVarietySeed.generated.json: neu generiert (66 Zeilen mit Klammer-Notation).
Gate: build ✓  eslint ✓  vitest 91/91 ✓  e2e 120/120 ✓

.gitea/workflows/ci.yml

@@ -48,26 +48,6 @@ jobs:
       - name: Build
         run: dotnet build GerbilManager.slnx --no-restore -c Release
 
-      - name: dotnet-ef Tool installieren
-        # 'tool update' ist idempotent (installiert wenn fehlend, sonst aktualisiert) —
-        # auf dem SELF-HOSTED Runner persistieren --global Tools, daher schlug 'tool install'
-        # ab dem 2. Lauf mit 'already installed' fehl und kippte den Backend-Job.
-        # GITHUB_PATH-Zeile: global tools landen in ~/.dotnet/tools, das auf dem Runner-Container
-        # nicht im PATH ist — einmalig eintragen, damit alle Folge-Steps 'dotnet ef' finden.
-        run: |
-          dotnet tool update --global dotnet-ef --version 10.0.*
-          echo "$HOME/.dotnet/tools" >> $GITHUB_PATH
-
-      - name: DB-3 EF Migrations Drift-Check
-        # Fails CI if the EF model diverges from the snapshot (i.e. a code change touched
-        # entities/OnModelCreating without generating a matching migration). Catches exactly
-        # the class of drift the SQLite/EnsureCreated test host is blind to.
-        run: >
-          dotnet ef migrations has-pending-model-changes
-          --project GerbilManagerWebAPI
-          --startup-project GerbilManagerWebAPI
-          --no-build --configuration Release
-
       - name: Tests ausfuehren
         run: dotnet test GerbilManager.slnx --no-build -c Release --logger "console;verbosity=normal"
 

.gitignore

@@ -131,9 +131,6 @@ $RECYCLE.BIN/
 # MemPalace per-project files (issue #185)
 mempalace.yaml
 entities.json
-
-# Runtime photo store (uploaded/imported gerbil photos) — never commit
-GerbilManagerWebAPI/photo-storage/
-
-# AR-3: Data Protection key ring (dev-only ephemeral keys) — never commit
-GerbilManagerWebAPI/.data-protection-keys/
+
+# Runtime photo store (uploaded/imported gerbil photos) — never commit
+GerbilManagerWebAPI/photo-storage/

GerbilManager.Tests/ImportServiceTests.cs

@@ -103,31 +103,6 @@ namespace GerbilManager.Tests
             Assert.Equal(2, await db.Litters.CountAsync());
         }
 
-        [Fact]
-        public async Task DB5_Litter_ExternalRef_set_and_used_for_idempotency()
-        {
-            // DB-5: litters must have ExternalRef set to the source litter id on first import,
-            // and subsequent runs must detect them via ExternalRef (not just Name+Date).
-            using var db = NewDb();
-            await new ImportService(db, _dir, _dir).RunAsync(execute: true);
-
-            // ExternalRef is set on created litters
-            var litters = await db.Litters.ToListAsync();
-            Assert.All(litters, l => Assert.NotNull(l.ExternalRef));
-            Assert.Contains(litters, l => l.ExternalRef == "L1");
-            Assert.Contains(litters, l => l.ExternalRef == "L2");
-
-            // Simulate the "Name+Date lookup would still work, but ExternalRef is now primary":
-            // mutate Name to something different — Name+Date fallback would fail, ExternalRef must catch it.
-            foreach (var l in litters) l.Name = "Geänderter Name";
-            await db.SaveChangesAsync();
-
-            // Re-import: litters detected as existing via ExternalRef even though Name changed
-            var second = await new ImportService(db, _dir, _dir).RunAsync(execute: true);
-            Assert.Equal(0, second.Litters.Created);
-            Assert.Equal(2, await db.Litters.CountAsync());
-        }
-
         [Fact]
         public async Task Execute_persists_deaf_flag_and_preserves_sls_and_tags()
         {
@@ -605,74 +580,6 @@ namespace GerbilManager.Tests
             Assert.Equal(new DateOnly(y, m, d), date);
         }
 
-        [Fact]
-        public async Task CR9_NameDOB_drift_falls_back_to_ExternalRef_no_throw()
-        {
-            // CR-9: if an already-imported animal's Name or DOB in animals.json no longer matches
-            // what's stored in the DB (e.g. after a correctDob remap or manual UI rename), the
-            // gidByNameDob lookup used to throw KeyNotFoundException. Now it falls back to the
-            // stable ExternalRef without throwing.
-            var dir = Path.Combine(Path.GetTempPath(), "cr9-" + Guid.NewGuid().ToString("N"));
-            Directory.CreateDirectory(dir);
-            try
-            {
-                File.WriteAllText(Path.Combine(dir, "litters.json"), "[]");
-                File.WriteAllText(Path.Combine(dir, "animals.json"), """
-                [{"id":"drift","name":"Drift Tier","dob":"01.01.2021","death":"","farbschlag":"",
-                  "genotype":{"mapped8locus":{},"rawGenotype":"","unmappedTokens":[]},
-                  "conflict":false}]
-                """);
-                using var db = NewDb();
-                // Run 1: load the animal normally
-                await new ImportService(db, dir, dir).RunAsync(execute: true);
-                Assert.Equal(1, await db.Gerbils.CountAsync());
-
-                // Simulate drift: manually rename the animal in the DB (UI rename scenario)
-                var g = await db.Gerbils.SingleAsync(x => x.ExternalRef == "drift");
-                g.Name = "Umbenannt Tier";
-                await db.SaveChangesAsync();
-
-                // Run 2: animals.json still has old name "Drift Tier" — must NOT throw
-                var report2 = await new ImportService(db, dir, dir).RunAsync(execute: false);
-                // Dry-run should complete without throwing; animal is found by ExternalRef fallback
-                Assert.Equal(1, await db.Gerbils.CountAsync());   // no duplicate created
-            }
-            finally { try { Directory.Delete(dir, recursive: true); } catch { } }
-        }
-
-        [Fact]
-        public async Task CR11_ColorVariety_derived_from_genotype_when_no_explicit_farbschlag()
-        {
-            // CR-11: deep-band animals have empty Farbschlag but a full genotype. The loader
-            // must derive ColorVarietyId from the catalog when the name-match yields nothing.
-            // "Agouti" = aa CC DD EE GG PP spsp rere (first seed entry, ID 00000001).
-            var dir = Path.Combine(Path.GetTempPath(), "cr11-" + Guid.NewGuid().ToString("N"));
-            Directory.CreateDirectory(dir);
-            try
-            {
-                File.WriteAllText(Path.Combine(dir, "litters.json"), "[]");
-                // Exact Agouti genotype, no explicit Farbschlag name
-                File.WriteAllText(Path.Combine(dir, "animals.json"), """
-                [{"id":"agouti-deep","name":"Opa Waldmann","dob":"01.01.2018","death":"","farbschlag":"",
-                  "genotype":{"mapped8locus":{"A":["a","a"],"C":["C","C"],"D":["D","D"],"E":["E","E"],"G":["G","G"],"P":["P","P"],"Sp":["sp","sp"],"Re":["re","re"]},
-                              "rawGenotype":"aa CC DD EE GG PP spsp rere","unmappedTokens":[]},
-                  "conflict":false}]
-                """);
-                using var db = NewDb();
-                var report = await new ImportService(db, dir, dir).RunAsync(execute: true);
-
-                var tier = await db.Gerbils.SingleAsync(g => g.ExternalRef == "agouti-deep");
-                // ColorVarietyId must be set even though no explicit Farbschlag name was given
-                Assert.NotNull(tier.ColorVarietyId);
-                // Should be the "Agouti" variety (id = 00000000-0000-0000-0000-000000000001)
-                var variety = await db.ColorVarieties.FindAsync(tier.ColorVarietyId);
-                Assert.Equal("Agouti", variety!.Name);
-                // Report counter should reflect the genotype derivation
-                Assert.True(report.Animals.FarbschlagDerivedFromGenotype > 0);
-            }
-            finally { try { Directory.Delete(dir, recursive: true); } catch { } }
-        }
-
         // ---- fixtures ----
         private const string LittersJson = """
         [

GerbilManager.Tests/NameSuggestionTests.cs

@@ -1,208 +0,0 @@
-using System.Net;
-using System.Text;
-using System.Text.Json;
-using GerbilManagerWebAPI.Names;
-using GerbilManagerWebAPI.SaleAd;
-using Microsoft.Extensions.Options;
-
-namespace GerbilManager.Tests
-{
-    /// <summary>
-    /// FEAT-NAMEGEN: NameSuggestionService — prompt assembly, JSON parse (incl. Markdown
-    /// fence strip), 503-not-configured path, upstream-error path.
-    /// </summary>
-    public class NameSuggestionTests
-    {
-        // ── Prompt assembly ───────────────────────────────────────────────────
-
-        [Fact]
-        public void SystemPrompt_verlangt_reines_JSON_ohne_Erklärungen()
-        {
-            var prompt = NameSuggestionService.BuildSystemPrompt();
-            Assert.Contains("reinen JSON-Array", prompt);
-            Assert.Contains("KEINE Markdown-Code-Blöcke", prompt);
-            Assert.Contains("name", prompt);
-            Assert.Contains("meaning", prompt);
-            Assert.Contains("origin", prompt);
-        }
-
-        [Fact]
-        public void UserPrompt_enthält_Anzahl_und_Anfangsbuchstaben()
-        {
-            var prompt = NameSuggestionService.BuildUserPrompt("A", "female", "norn,mythg", 6);
-            Assert.Contains("6", prompt);
-            Assert.Contains("\"A\"", prompt);
-            Assert.Contains("weibliche", prompt);
-            Assert.Contains("norn,mythg", prompt);
-        }
-
-        [Fact]
-        public void UserPrompt_ohne_optionale_Parameter_ist_gültig()
-        {
-            var prompt = NameSuggestionService.BuildUserPrompt(null, null, null, 5);
-            Assert.Contains("5", prompt);
-            Assert.DoesNotContain("Buchstaben", prompt);
-            Assert.DoesNotContain("weibliche", prompt);
-            Assert.DoesNotContain("männliche", prompt);
-        }
-
-        [Fact]
-        public void UserPrompt_gender_any_wird_nicht_im_Prompt_erwähnt()
-        {
-            var prompt = NameSuggestionService.BuildUserPrompt(null, "any", null, 3);
-            Assert.DoesNotContain("weibliche", prompt);
-            Assert.DoesNotContain("männliche", prompt);
-        }
-
-        // ── JSON parsing ──────────────────────────────────────────────────────
-
-        [Fact]
-        public void ParseSuggestions_verarbeitet_reines_JSON()
-        {
-            var json = """[{"name":"Astrid","meaning":"göttliche Stärke","origin":"Altnordisch"}]""";
-            var result = NameSuggestionService.ParseSuggestions(json);
-            Assert.NotNull(result);
-            Assert.Single(result);
-            Assert.Equal("Astrid", result[0].Name);
-            Assert.Equal("göttliche Stärke", result[0].Meaning);
-            Assert.Equal("Altnordisch", result[0].Origin);
-        }
-
-        [Fact]
-        public void ParseSuggestions_strippt_json_Markdown_Fence()
-        {
-            var fenced = "```json\n[{\"name\":\"Aiko\",\"meaning\":\"kleine Geliebte\",\"origin\":\"Japanisch\"}]\n```";
-            var result = NameSuggestionService.ParseSuggestions(fenced);
-            Assert.NotNull(result);
-            Assert.Equal("Aiko", result![0].Name);
-        }
-
-        [Fact]
-        public void ParseSuggestions_strippt_generische_Markdown_Fence()
-        {
-            var fenced = "```\n[{\"name\":\"Luna\",\"meaning\":\"Mond\",\"origin\":\"Lateinisch\"}]\n```";
-            var result = NameSuggestionService.ParseSuggestions(fenced);
-            Assert.NotNull(result);
-            Assert.Equal("Luna", result![0].Name);
-        }
-
-        [Fact]
-        public void ParseSuggestions_toleriert_umgebenden_Text_vor_Array()
-        {
-            var messy = "Hier sind die Namen:\n[{\"name\":\"Sol\",\"meaning\":\"Sonne\",\"origin\":\"Nordisch\"}]\nHoffnungslos.";
-            var result = NameSuggestionService.ParseSuggestions(messy);
-            Assert.NotNull(result);
-            Assert.Equal("Sol", result![0].Name);
-        }
-
-        [Fact]
-        public void ParseSuggestions_gibt_null_zurück_bei_ungültigem_JSON()
-        {
-            Assert.Null(NameSuggestionService.ParseSuggestions("kein json"));
-            Assert.Null(NameSuggestionService.ParseSuggestions("{\"name\":\"X\"}"));
-            Assert.Null(NameSuggestionService.ParseSuggestions(""));
-        }
-
-        // ── 503: nicht konfiguriert ───────────────────────────────────────────
-
-        [Theory]
-        [InlineData(null, "key", "model")]
-        [InlineData("https://api.example.com/v1", null, "model")]
-        [InlineData("https://api.example.com/v1", "key", null)]
-        [InlineData(null, null, null)]
-        public async Task SuggestAsync_gibt_NotConfigured_wenn_AI_Key_fehlt(
-            string? baseUrl, string? apiKey, string? model)
-        {
-            var service = CreateService(baseUrl, apiKey, model,
-                new StubHandler(_ => throw new InvalidOperationException("darf nicht aufgerufen werden")));
-
-            var result = await service.SuggestAsync(null, null, null, 5);
-
-            Assert.Equal(NameSuggestionStatus.NotConfigured, result.Status);
-            Assert.Null(result.Suggestions);
-        }
-
-        // ── Gemini-Antwort wird geparst ───────────────────────────────────────
-
-        [Fact]
-        public async Task SuggestAsync_parst_valide_JSON_Antwort()
-        {
-            var payload = """[{"name":"Astrid","meaning":"göttliche Stärke","origin":"Altnordisch"},{"name":"Aiko","meaning":"kleine Geliebte","origin":"Japanisch"}]""";
-            var handler = new StubHandler(_ => Canned(payload));
-            var service = CreateService("https://generativelanguage.googleapis.com/v1beta/openai", "k", "gemini-2.0-flash", handler);
-
-            var result = await service.SuggestAsync("A", "female", "norn,japa", 2);
-
-            Assert.Equal(NameSuggestionStatus.Ok, result.Status);
-            Assert.NotNull(result.Suggestions);
-            Assert.Equal(2, result.Suggestions!.Count);
-            Assert.Equal("Astrid", result.Suggestions[0].Name);
-        }
-
-        [Fact]
-        public async Task SuggestAsync_parst_JSON_in_Markdown_Fence()
-        {
-            var fenced = "```json\n[{\"name\":\"Luna\",\"meaning\":\"Mond\",\"origin\":\"Lateinisch\"}]\n```";
-            var handler = new StubHandler(_ => Canned(fenced));
-            var service = CreateService("https://api.example.com/v1", "k", "m", handler);
-
-            var result = await service.SuggestAsync(null, null, null, 1);
-
-            Assert.Equal(NameSuggestionStatus.Ok, result.Status);
-            Assert.Equal("Luna", result.Suggestions![0].Name);
-        }
-
-        [Fact]
-        public async Task SuggestAsync_gibt_UpstreamError_bei_ungültigem_JSON()
-        {
-            var handler = new StubHandler(_ => Canned("das ist kein json"));
-            var service = CreateService("https://api.example.com/v1", "k", "m", handler);
-
-            var result = await service.SuggestAsync(null, null, null, 3);
-
-            Assert.Equal(NameSuggestionStatus.UpstreamError, result.Status);
-            Assert.Null(result.Suggestions);
-        }
-
-        [Fact]
-        public async Task SuggestAsync_gibt_UpstreamError_bei_HTTP_Fehler()
-        {
-            var handler = new StubHandler(_ => new HttpResponseMessage(HttpStatusCode.TooManyRequests));
-            var service = CreateService("https://api.example.com/v1", "k", "m", handler);
-
-            var result = await service.SuggestAsync(null, null, null, 3);
-
-            Assert.Equal(NameSuggestionStatus.UpstreamError, result.Status);
-        }
-
-        // ── Helfer ────────────────────────────────────────────────────────────
-
-        private static NameSuggestionService CreateService(
-            string? baseUrl, string? apiKey, string? model, StubHandler handler)
-        {
-            var options = Options.Create(new AiOptions { BaseUrl = baseUrl, ApiKey = apiKey, Model = model });
-            return new NameSuggestionService(new HttpClient(handler), options);
-        }
-
-        private static HttpResponseMessage Canned(string content)
-        {
-            var completion = new
-            {
-                choices = new[] { new { message = new { role = "assistant", content } } },
-            };
-            return new HttpResponseMessage(HttpStatusCode.OK)
-            {
-                Content = new StringContent(JsonSerializer.Serialize(completion),
-                    Encoding.UTF8, "application/json"),
-            };
-        }
-
-        private sealed class StubHandler(Func<HttpRequestMessage, HttpResponseMessage> respond)
-            : HttpMessageHandler
-        {
-            protected override Task<HttpResponseMessage> SendAsync(
-                HttpRequestMessage request, CancellationToken cancellationToken)
-                => Task.FromResult(respond(request));
-        }
-    }
-}

GerbilManager.Tests/PartialUpdateTests.cs

@@ -1,145 +0,0 @@
-using System.Net;
-using System.Net.Http.Json;
-using System.Text.Json;
-using System.Text.RegularExpressions;
-
-namespace GerbilManager.Tests;
-
-/// <summary>CR-2 regression: PUT /gerbils/{id} must not silently destroy fields that
-/// the caller omits (PATCH semantics). The ForSale-toggle and Charakterbogen-save
-/// send partial bodies — all other fields must be preserved unchanged.</summary>
-public class PartialUpdateTests : IClassFixture<ApiFactory>
-{
-    private readonly HttpClient _client;
-
-    public PartialUpdateTests(ApiFactory factory) => _client = factory.CreateClient();
-
-    // ------------------------------------------------------------------ helpers
-
-    private static Guid ExtractId(string json) =>
-        Guid.Parse(Regex.Match(json, "\"id\":\"([^\"]+)\"").Groups[1].Value);
-
-    private static string? GetStr(JsonElement el, string prop) =>
-        el.TryGetProperty(prop, out var v) && v.ValueKind == JsonValueKind.String
-            ? v.GetString() : null;
-
-    private static string? GetNested(JsonElement el, string prop) =>
-        el.TryGetProperty(prop, out var v) ? v.ToString() : null;
-
-    /// <summary>Create a fully-populated gerbil and return its id.</summary>
-    private async Task<Guid> CreateFullGerbil(string name = "TestTier")
-    {
-        // Use name-derived unique externalRef so the DB-1 unique constraint doesn't fire
-        // when multiple tests in the same fixture share the SQLite connection.
-        var resp = await _client.PostAsync("/gerbils", JsonContent.Create(new
-        {
-            name,
-            gender = "female",
-            genotype = "aa CC DD ee GG PP spsp rere",
-            originBreeder = "Zucht der Kleinen Chaoten",
-            isDeaf = false,
-            characterTraits = new[] { "neugierig", "zutraulich" },
-            characterNote = "Liebling der Familie",
-            notes = "Eine Notiz",
-            externalRef = $"ext-{name.GetHashCode():X8}",
-        }));
-        Assert.Equal(HttpStatusCode.Created, resp.StatusCode);
-        return ExtractId(await resp.Content.ReadAsStringAsync());
-    }
-
-    // ------------------------------------------------------------------ tests
-
-    [Fact]
-    public async Task ForSale_toggle_does_not_wipe_other_fields()
-    {
-        // Arrange: create a fully-populated gerbil
-        var id = await CreateFullGerbil("ForSale-Tier");
-
-        // Act: send only { status: 'ForSale' } — exactly what the detail page does
-        var put = await _client.PutAsync($"/gerbils/{id}",
-            JsonContent.Create(new { status = "ForSale" }));
-        Assert.Equal(HttpStatusCode.NoContent, put.StatusCode);
-
-        // Assert: re-read and check all fields survive
-        var json = JsonDocument.Parse(await _client.GetStringAsync($"/gerbils/{id}")).RootElement;
-
-        Assert.Equal("ForSale", GetStr(json, "status"));
-        Assert.Equal("ForSale-Tier", GetStr(json, "name"));
-        Assert.Equal("female", GetStr(json, "gender"));
-        Assert.Equal("aa CC DD ee GG PP spsp rere", GetStr(json, "genotype"));
-        Assert.Equal("Zucht der Kleinen Chaoten", GetStr(json, "originBreeder"));
-        Assert.Equal("Eine Notiz", GetStr(json, "notes"));
-        Assert.NotNull(GetStr(json, "externalRef")); // externalRef set during create, not cleared by partial PUT
-        Assert.Contains("neugierig", GetNested(json, "characterTraits") ?? "");
-        Assert.Equal("Liebling der Familie", GetStr(json, "characterNote"));
-    }
-
-    [Fact]
-    public async Task CharacterSave_does_not_wipe_other_fields()
-    {
-        // Arrange
-        var id = await CreateFullGerbil("Charakter-Tier");
-
-        // Act: send only { characterTraits, characterNote } — exactly what the Charakterbogen save does
-        var put = await _client.PutAsync($"/gerbils/{id}", JsonContent.Create(new
-        {
-            characterTraits = new[] { "handzahm" },
-            characterNote = "Neue Notiz",
-        }));
-        Assert.Equal(HttpStatusCode.NoContent, put.StatusCode);
-
-        // Assert: name / genotype / originBreeder / status / externalRef all intact
-        var json = JsonDocument.Parse(await _client.GetStringAsync($"/gerbils/{id}")).RootElement;
-
-        Assert.Equal("Active", GetStr(json, "status"));
-        Assert.Equal("Charakter-Tier", GetStr(json, "name"));
-        Assert.Equal("female", GetStr(json, "gender"));
-        Assert.Equal("aa CC DD ee GG PP spsp rere", GetStr(json, "genotype"));
-        Assert.Equal("Zucht der Kleinen Chaoten", GetStr(json, "originBreeder"));
-        Assert.Equal("Eine Notiz", GetStr(json, "notes"));
-        Assert.NotNull(GetStr(json, "externalRef")); // externalRef set during create, not cleared by partial PUT
-        Assert.Contains("handzahm", GetNested(json, "characterTraits") ?? "");
-        Assert.Equal("Neue Notiz", GetStr(json, "characterNote"));
-    }
-
-    [Fact]
-    public async Task EditForm_omitting_import_fields_keeps_them()
-    {
-        // Arrange: gerbil with import-set fields
-        var id = await CreateFullGerbil("EditForm-Tier");
-
-        // Act: send a typical edit-form body that omits originBreeder/isDeaf/externalRef/characterTraits/characterNote
-        var put = await _client.PutAsync($"/gerbils/{id}", JsonContent.Create(new
-        {
-            name = "EditForm-Tier (umbenannt)",
-            gender = "female",
-            genotype = "aa CC DD ee GG PP spsp rere",
-            notes = "Aktualisierte Notiz",
-        }));
-        Assert.Equal(HttpStatusCode.NoContent, put.StatusCode);
-
-        // Assert: name updated, import fields survive
-        var json = JsonDocument.Parse(await _client.GetStringAsync($"/gerbils/{id}")).RootElement;
-
-        Assert.Equal("EditForm-Tier (umbenannt)", GetStr(json, "name"));
-        Assert.Equal("Aktualisierte Notiz", GetStr(json, "notes"));
-        Assert.Equal("Zucht der Kleinen Chaoten", GetStr(json, "originBreeder"));
-        Assert.NotNull(GetStr(json, "externalRef")); // externalRef set during create, not cleared by partial PUT
-        Assert.Contains("neugierig", GetNested(json, "characterTraits") ?? "");
-        Assert.Equal("Liebling der Familie", GetStr(json, "characterNote"));
-    }
-
-    [Fact]
-    public async Task Create_with_minimal_body_uses_safe_defaults()
-    {
-        // A minimal POST (only name) must still produce a valid gerbil
-        var resp = await _client.PostAsync("/gerbils", JsonContent.Create(new { name = "Minimal" }));
-        Assert.Equal(HttpStatusCode.Created, resp.StatusCode);
-
-        var json = JsonDocument.Parse(await resp.Content.ReadAsStringAsync()).RootElement;
-        Assert.Equal("Minimal", GetStr(json, "name"));
-        Assert.Equal("Active", GetStr(json, "status"));
-        // characterTraits defaults to [] on create when not provided
-        Assert.Contains("[]", GetNested(json, "characterTraits") ?? "");
-    }
-}

GerbilManagerWebAPI/ApplicationContext.cs

@@ -49,13 +49,6 @@ public class ApplicationContext : DbContext
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
-        // DB-4: ICU German collation on user-visible / searched text columns.
-        // "de-x-icu" gives correct German sort order (ä between a and b) and locale-aware
-        // case-folding (lower('Ä')='ä'). Applied only on Npgsql (Postgres); SQLite does not
-        // support custom collation names and would fail EnsureCreated on the test host.
-        const string DeIcu = "de-x-icu";
-        bool isNpgsql = Database.ProviderName?.Contains("Npgsql", StringComparison.OrdinalIgnoreCase) ?? false;
-
         modelBuilder.Entity<Gerbil>(e =>
         {
             // Enums persisted as their string names (readable, Gridify-friendly).
@@ -65,14 +58,6 @@ public class ApplicationContext : DbContext
             // Residency defaults to true (own stock unless explicitly marked external).
             e.Property(g => g.IsResident).HasDefaultValue(true);
 
-            // DB-4: German collation on searched/sorted name fields (Npgsql-only).
-            if (isNpgsql)
-            {
-                e.Property(g => g.Name).UseCollation(DeIcu);
-                e.Property(g => g.NameSearch).UseCollation(DeIcu);
-                e.Property(g => g.OriginBreeder).UseCollation(DeIcu);
-            }
-
             // FEAT-14: character traits stored as a JSON text column (works on both
             // Npgsql and the SQLite test host; opaque labels, no backend vocabulary).
             var traitsConverter = new Microsoft.EntityFrameworkCore.Storage.ValueConversion.ValueConverter<List<string>, string>(
@@ -96,12 +81,6 @@ public class ApplicationContext : DbContext
                 .HasForeignKey(g => g.EnclosureId).OnDelete(DeleteBehavior.SetNull);
             e.HasOne(g => g.ColorVariety).WithMany()
                 .HasForeignKey(g => g.ColorVarietyId).OnDelete(DeleteBehavior.SetNull);
-
-            // DB-1: ExternalRef is the import idempotency key — enforce uniqueness at the DB level.
-            // Filtered (nulls allowed: manually-entered animals have no ExternalRef).
-            e.HasIndex(g => g.ExternalRef)
-                .IsUnique()
-                .HasFilter("\"ExternalRef\" IS NOT NULL");
         });
 
         modelBuilder.Entity<Litter>(e =>
@@ -110,12 +89,6 @@ public class ApplicationContext : DbContext
                 .HasForeignKey(l => l.FatherId).OnDelete(DeleteBehavior.Restrict);
             e.HasOne(l => l.Mother).WithMany()
                 .HasForeignKey(l => l.MotherId).OnDelete(DeleteBehavior.Restrict);
-
-            // DB-5: ExternalRef = source litter id from extract.py.
-            // Unique (filtered, nulls allowed for manually-entered litters).
-            e.HasIndex(l => l.ExternalRef)
-                .IsUnique()
-                .HasFilter("\"ExternalRef\" IS NOT NULL");
         });
 
         modelBuilder.Entity<HealthRecord>(e =>
@@ -197,15 +170,6 @@ public class ApplicationContext : DbContext
         modelBuilder.Entity<MailSettings>()
             .HasData(new MailSettings { Id = GerbilManagerWebAPI.Models.MailSettings.SingletonId });
 
-        // DB-4: German collation on remaining searched/sorted text columns (Npgsql-only).
-        if (isNpgsql)
-        {
-            modelBuilder.Entity<ColorVariety>()
-                .Property(v => v.Name).UseCollation(DeIcu);
-            modelBuilder.Entity<Contact>()
-                .Property(c => c.Name).UseCollation(DeIcu);
-        }
-
         SeedColorVarieties(modelBuilder);
     }
 

GerbilManagerWebAPI/Dtos/ApiDtos.cs

@@ -59,8 +59,8 @@ namespace GerbilManagerWebAPI.Dtos
     // Request DTOs -----------------------------------------------------------
 
     public record GerbilInput(
-        string? Name,
-        Gender? Gender,
+        string Name,
+        Gender Gender,
         GerbilStatus? Status,
         Guid? LitterId,
         Guid? OriginContactId,

GerbilManagerWebAPI/Endpoints/GerbilEndpoints.cs

@@ -39,18 +39,19 @@ namespace GerbilManagerWebAPI.Endpoints
                 if (string.IsNullOrWhiteSpace(input.Name))
                     return TypedResults.ValidationProblem(new Dictionary<string, string[]> { ["name"] = ["Name is required."] });
 
-                var g = new Gerbil { Id = Guid.NewGuid(), Name = input.Name! };
+                var g = new Gerbil { Id = Guid.NewGuid(), Name = input.Name };
                 Apply(g, input, isCreate: true);
                 db.Gerbils.Add(g);
                 await db.SaveChangesAsync();
                 return TypedResults.Created($"/gerbils/{g.Id}", ToDto(g));
             });
 
-            // PUT /gerbils/{id}  — PATCH semantics: omitted/null fields keep the stored value.
+            // PUT /gerbils/{id}
             group.MapPut("/{id:guid}", async Task<Results<NoContent, NotFound>> (Guid id, GerbilInput input, ApplicationContext db) =>
             {
                 var g = await db.Gerbils.FirstOrDefaultAsync(x => x.Id == id);
                 if (g is null) return TypedResults.NotFound();
+                g.Name = input.Name;
                 Apply(g, input, isCreate: false);
                 await db.SaveChangesAsync();
                 return TypedResults.NoContent();
@@ -76,34 +77,27 @@ namespace GerbilManagerWebAPI.Endpoints
             return app;
         }
 
-        // CR-2 FIX: PATCH semantics — every omitted/null field keeps the stored value.
-        // Prevents silent data loss when the frontend sends partial bodies (ForSale toggle,
-        // Charakterbogen save, any partial updateGerbil call). On create, supply safe defaults
-        // for fields the frontend omits. A non-null input value always wins (including explicit
-        // nulls — callers that want to clear a nullable field must send a full object; a
-        // dedicated PATCH endpoint can be added later if point-clear is needed).
         private static void Apply(Gerbil g, GerbilInput i, bool isCreate)
         {
-            if (!string.IsNullOrWhiteSpace(i.Name)) g.Name = i.Name!;
-            g.Gender = i.Gender ?? (isCreate ? Gender.unknown : g.Gender);
+            g.Gender = i.Gender;
             g.Status = i.Status ?? (isCreate ? GerbilStatus.Active : g.Status);
-            g.LitterId = i.LitterId ?? g.LitterId;
-            g.OriginContactId = i.OriginContactId ?? g.OriginContactId;
-            g.ReceiverContactId = i.ReceiverContactId ?? g.ReceiverContactId;
-            g.EnclosureId = i.EnclosureId ?? g.EnclosureId;
-            g.ColorVarietyId = i.ColorVarietyId ?? g.ColorVarietyId;
-            g.DateOfBirth = i.DateOfBirth ?? g.DateOfBirth;
-            g.DateOfDeath = i.DateOfDeath ?? g.DateOfDeath;
-            g.CauseOfDeath = i.CauseOfDeath ?? g.CauseOfDeath;
-            g.GoHomeDate = i.GoHomeDate ?? g.GoHomeDate;
-            g.Genotype = i.Genotype ?? g.Genotype;
-            g.Notes = i.Notes ?? g.Notes;
-            g.ImportSource = i.ImportSource ?? g.ImportSource;
-            g.ExternalRef = i.ExternalRef ?? g.ExternalRef;
-            g.OriginBreeder = i.OriginBreeder ?? g.OriginBreeder;
-            g.CharacterTraits = i.CharacterTraits ?? g.CharacterTraits;
-            g.CharacterNote = i.CharacterNote ?? g.CharacterNote;
-            g.IsDeaf = i.IsDeaf ?? g.IsDeaf;
+            g.LitterId = i.LitterId;
+            g.OriginContactId = i.OriginContactId;
+            g.ReceiverContactId = i.ReceiverContactId;
+            g.EnclosureId = i.EnclosureId;
+            g.ColorVarietyId = i.ColorVarietyId;
+            g.DateOfBirth = i.DateOfBirth;
+            g.DateOfDeath = i.DateOfDeath;
+            g.CauseOfDeath = i.CauseOfDeath;
+            g.GoHomeDate = i.GoHomeDate;
+            g.Genotype = i.Genotype;
+            g.Notes = i.Notes;
+            g.ImportSource = i.ImportSource;
+            g.ExternalRef = i.ExternalRef;
+            g.OriginBreeder = i.OriginBreeder;
+            g.CharacterTraits = i.CharacterTraits ?? new List<string>();
+            g.CharacterNote = i.CharacterNote;
+            g.IsDeaf = i.IsDeaf;
             g.IsResident = i.IsResident ?? (isCreate ? true : g.IsResident);
         }
 

GerbilManagerWebAPI/Endpoints/NamesEndpoints.cs

@@ -1,38 +0,0 @@
-using GerbilManagerWebAPI.Names;
-
-namespace GerbilManagerWebAPI.Endpoints
-{
-    /// <summary>
-    /// FEAT-NAMEGEN: GET /names/suggest — meaningful gerbil name suggestions via Gemini.
-    ///
-    /// 503 {code:"NamesKeyMissing"} while the AI section is unconfigured — the
-    /// frontend maps exactly this code to its German disabled-state hint.
-    /// </summary>
-    public static class NamesEndpoints
-    {
-        public static IEndpointRouteBuilder MapNamesEndpoints(this IEndpointRouteBuilder app)
-        {
-            app.MapGet("/names/suggest", async (
-                string? letter,
-                string? gender,
-                string? usages,
-                int count,
-                NameSuggestionService service,
-                CancellationToken ct) =>
-            {
-                var result = await service.SuggestAsync(letter, gender, usages, count, ct);
-                return result.Status switch
-                {
-                    NameSuggestionStatus.Ok => Results.Ok(result.Suggestions),
-                    NameSuggestionStatus.NotConfigured => Results.Json(
-                        new { code = "NamesKeyMissing", message = result.Error ?? "" }, statusCode: 503),
-                    _ => Results.Json(
-                        new { code = "NamesUpstreamError", message = result.Error ?? "" }, statusCode: 502),
-                };
-            })
-            .WithTags("Names");
-
-            return app;
-        }
-    }
-}

GerbilManagerWebAPI/GerbilManagerWebAPI.csproj

@@ -1,40 +1,39 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <UserSecretsId>d5041cff-22a2-4aba-80ff-903ce5203eb3</UserSecretsId>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.4.2" />
-    <PackageReference Include="DocumentFormat.OpenXml" Version="3.5.1" />
-    <PackageReference Include="MailKit" Version="4.17.0" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.2" />
-    <PackageReference Include="Gridify" Version="2.19.1" />
-    <PackageReference Include="Gridify.EntityFramework" Version="2.19.1" />
-    <PackageReference Include="Scalar.AspNetCore" Version="2.14.14" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\GerbilManager.ServiceDefaults\GerbilManager.ServiceDefaults.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- FEAT-13: Abgabevertrag-Vorlage wird als eingebettete Ressource ausgeliefert. -->
-    <EmbeddedResource Include="Contracts\Templates\Abgabevertrag.docx" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- FEAT-12a: Tests prüfen interne Bausteine (z. B. die Completions-URL). -->
-    <InternalsVisibleTo Include="GerbilManager.Tests" />
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.4.2" />
+    <PackageReference Include="DocumentFormat.OpenXml" Version="3.5.1" />
+    <PackageReference Include="MailKit" Version="4.17.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.2" />
+    <PackageReference Include="Gridify" Version="2.19.1" />
+    <PackageReference Include="Gridify.EntityFramework" Version="2.19.1" />
+    <PackageReference Include="Scalar.AspNetCore" Version="2.14.14" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\GerbilManager.ServiceDefaults\GerbilManager.ServiceDefaults.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- FEAT-13: Abgabevertrag-Vorlage wird als eingebettete Ressource ausgeliefert. -->
+    <EmbeddedResource Include="Contracts\Templates\Abgabevertrag.docx" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- FEAT-12a: Tests prüfen interne Bausteine (z. B. die Completions-URL). -->
+    <InternalsVisibleTo Include="GerbilManager.Tests" />
+  </ItemGroup>
+
+</Project>

GerbilManagerWebAPI/Import/ImportModels.cs

@@ -82,12 +82,8 @@ namespace GerbilManagerWebAPI.Import
         ResidencySummary? Residency = null);
 
     /// <summary>Bestand (resident) vs external pedigree ancestors; FlippedByParentRule = foreign-
-    /// Zuchtname animals made resident because they parented a Clan offspring (rule b).
-    /// HerkunftBackfilled = resident animals whose null OriginBreeder was filled (safe, no overwrite).
-    /// FarbschlagWouldRebackfill = already-imported animals with a stale ColorVariety that the
-    /// current extract would update (no-op counter until the safety mechanism is ratified).</summary>
-    public sealed record ResidencySummary(int Resident, int External, int FlippedByParentRule,
-        int HerkunftBackfilled = 0, int FarbschlagWouldRebackfill = 0);
+    /// Zuchtname animals made resident because they parented a Clan offspring (rule b).</summary>
+    public sealed record ResidencySummary(int Resident, int External, int FlippedByParentRule);
 
     public sealed record LitterSummary(int InSource, int Created, int AlreadyImported,
         int DerivedFromChart = 0, int DerivedSkipped = 0, int ParentFksDropped = 0,
@@ -102,8 +98,7 @@ namespace GerbilManagerWebAPI.Import
         int AlreadyImported,
         QuarantineSummary Quarantined,
         int ParentLinksFromChart = 0,
-        int ConflictsResolvedByDecision = 0,
-        int FarbschlagDerivedFromGenotype = 0);
+        int ConflictsResolvedByDecision = 0);
 
     public sealed record QuarantineSummary(
         int Conflicts,

GerbilManagerWebAPI/Import/ImportService.cs

@@ -71,21 +71,17 @@ namespace GerbilManagerWebAPI.Import
                 else if (conf == "niedrig") dateOnly++;
             }
 
-            // existing rows (idempotency).
+            // existing rows (idempotency). Gerbils carry ExternalRef; Litters have no such
+            // column, so we key litter idempotency on the stable (Name + Date) pair instead.
             var existingGerbilExtRefs = await _db.Gerbils
                 .Where(g => g.ExternalRef != null)
                 .Select(g => g.ExternalRef!).ToListAsync();
             var existingGerbilSet = existingGerbilExtRefs.ToHashSet();
 
-            // DB-5: Litters now carry ExternalRef (= source litter id from extract.py).
-            // Primary idempotency: ExternalRef. Fallback: Name+Date for litters created before DB-5.
-            var existingLitterData = await _db.Litters
-                .Select(l => new { l.Name, l.Date, l.ExternalRef }).ToListAsync();
-            var existingLitterKeySet = existingLitterData
+            var existingLitterKeys = await _db.Litters
+                .Select(l => new { l.Name, l.Date }).ToListAsync();
+            var existingLitterKeySet = existingLitterKeys
                 .Select(x => $"{x.Name}|{x.Date:yyyy-MM-dd}").ToHashSet();
-            var existingLitterExtRefSet = existingLitterData
-                .Where(x => x.ExternalRef != null)
-                .Select(x => x.ExternalRef!).ToHashSet();
 
             // colour-variety name -> id (case-insensitive)
             var varieties = await _db.ColorVarieties.Select(v => new { v.Id, v.Name }).ToListAsync();
@@ -98,10 +94,10 @@ namespace GerbilManagerWebAPI.Import
             var damNames = litters.Select(l => Normalize(StripZucht(l.DamName))).Where(s => s.Length > 0).ToHashSet();
 
             // ---- litters: create map source.id -> Litter (for high-confidence animal links) ----
-            // Idempotency (DB-5): ExternalRef-match is primary (stable source id); Name+Date is the
-            // fallback for litters created before DB-5 (those have ExternalRef=null in the DB).
             // COUNTER-BUG FIX: undated litters (31 in the Wurfchronik) have no parseable date,
-            // so skip them early — they can never be created or linked to animals.
+            // so their existingLitterKeySet key was always "" → they were always counted as
+            // "created" even though the execute block skipped them (date is DateOnly d = false).
+            // Fix: skip undated litters early — they can never be created or linked to animals.
             int littersCreated = 0, littersExisting = 0, littersWithoutDate = 0;
             var litterIdMap = new Dictionary<string, Guid>();    // source litter id -> Litter.Id
             foreach (var sl in litters)
@@ -111,10 +107,7 @@ namespace GerbilManagerWebAPI.Import
 
                 var name = $"Wurf {sl.LitterId}".Trim();
                 var key = $"{name}|{date:yyyy-MM-dd}";
-                // DB-5: check ExternalRef first (stable, source-id-based); fall back to Name+Date
-                // for litters imported before ExternalRef existed (those have ExternalRef = null).
-                if (existingLitterExtRefSet.Contains(sl.Id) || existingLitterKeySet.Contains(key))
-                { littersExisting++; continue; }
+                if (existingLitterKeySet.Contains(key)) { littersExisting++; continue; }
 
                 var id = Guid.NewGuid();
                 litterIdMap[sl.Id] = id;
@@ -129,7 +122,6 @@ namespace GerbilManagerWebAPI.Import
                         TotalBorn = sl.TotalBorn,
                         Notes = string.IsNullOrWhiteSpace(sl.Note) ? null : sl.Note,
                         PairingCode = string.IsNullOrWhiteSpace(sl.Zuchtnummer) ? null : sl.Zuchtnummer,
-                        ExternalRef = sl.Id,   // DB-5: stable import key for future re-imports
                     });
                 }
                 if (samples.Count < 8)
@@ -145,71 +137,31 @@ namespace GerbilManagerWebAPI.Import
             // name+DOB -> gid index, across EXISTING rows AND this run's planned animals, so that
             // chart-position parentRefs (PEDIGREE-LINK) can resolve a parent to a real gerbil id.
             var existingRows = await _db.Gerbils
-                .Select(g => new { g.Id, g.Name, g.DateOfBirth, g.ExternalRef, g.LitterId, g.ColorVarietyId }).ToListAsync();
+                .Select(g => new { g.Id, g.Name, g.DateOfBirth, g.ExternalRef, g.LitterId }).ToListAsync();
             var gidByNameDob = new Dictionary<string, Guid>();
             foreach (var g in existingRows)
                 gidByNameDob[NameDobKey(g.Name, g.DateOfBirth)] = g.Id;
             var existingLitterByExtRef = existingRows.Where(g => g.ExternalRef != null)
                 .ToDictionary(g => g.ExternalRef!, g => g.LitterId);
-            var existingColorVarietyByExtRef = existingRows.Where(g => g.ExternalRef != null)
-                .ToDictionary(g => g.ExternalRef!, g => g.ColorVarietyId);
-            // CR-9: ExternalRef → Gerbil.Id fallback for name/DOB drift on re-import
-            var existingGidByExtRef = existingRows.Where(g => g.ExternalRef != null)
-                .ToDictionary(g => g.ExternalRef!, g => g.Id);
-
-            // CR-11: load CanonicalGenotype for genotype-derived Farbschlag matching
-            var varietiesWithGeno = await _db.ColorVarieties
-                .Select(v => new { v.Id, v.Name, v.CanonicalGenotype }).ToListAsync();
 
             // PASS 1: assign ids + resolve fb/gender/Wurfchronik link (no writes yet).
             var plan = new List<AnimalPlan>();
-            int fbDerivedFromGenotype = 0;
             foreach (var a in loadable)
             {
                 bool exists = existingGerbilSet.Contains(a.Id);
-                // CR-9: use TryGetValue; fall back to ExternalRef lookup for name/DOB drift
-                // (e.g. correctDob remap or manual rename). Prevents throwing KeyNotFoundException.
-                Guid gid;
-                if (exists)
-                {
-                    if (!gidByNameDob.TryGetValue(NameDobKey(a.Name, ParseDate(a.Dob)), out gid))
-                    {
-                        if (existingGidByExtRef.TryGetValue(a.Id, out gid))
-                            notes.Add($"Hinweis: '{a.Name}' (*{a.Dob}) per ExternalRef gefunden trotz Name/DOB-Drift (correctDob oder UI-Umbenennung).");
-                        else
-                        {
-                            notes.Add($"Warnung: ExternalRef '{a.Id}' in DB vorhanden aber nicht auflösbar — Tier übersprungen.");
-                            continue;
-                        }
-                    }
-                }
-                else gid = Guid.NewGuid();
+                var gid = exists ? gidByNameDob[NameDobKey(a.Name, ParseDate(a.Dob))] : Guid.NewGuid();
 
                 Guid? wurfLitterId = null;
                 if (a.LitterRef?.Confidence == "hoch" && a.LitterRef.Candidates is not { Count: > 0 }
                     && litterIdMap.TryGetValue(a.LitterRef.LitterId, out var lid))
                     wurfLitterId = lid;
 
-                // CR-11: Farbschlag from explicit name-match first; fall back to genotype derivation
-                // (fill-NULL-only — never overwrites an explicit name-match or manual assignment).
                 Guid? colorVarietyId = null;
                 var fbCandidates = new[] { a.Farbschlag }.Concat(a.FarbschlagVariants)
                     .Where(s => !string.IsNullOrWhiteSpace(s));
                 foreach (var fb in fbCandidates)
                     if (varietyByName.TryGetValue(fb.Trim().ToLowerInvariant(), out var vid))
                     { colorVarietyId = vid; break; }
-                if (colorVarietyId is null && a.Genotype.Mapped8locus.Count >= 8)
-                {
-                    // CR-11: only derive from a fully-specified genotype (all 8 loci known,
-                    // no "??" wildcards). Partial genotypes (single-locus or sparse records)
-                    // would match any catalog entry via wildcards and produce false positives.
-                    var composed = ComposeGenotype(a.Genotype);
-                    if (!composed.Contains("??"))
-                        foreach (var v in varietiesWithGeno)
-                            if (!string.IsNullOrWhiteSpace(v.CanonicalGenotype)
-                                && GenotypePotentiallyMatches(composed, v.CanonicalGenotype))
-                            { colorVarietyId = v.Id; fbDerivedFromGenotype++; break; }
-                }
 
                 var gender = InferGender(a, sireNames, damNames);
                 var norm = Normalize(StripZucht(a.Name));
@@ -217,8 +169,7 @@ namespace GerbilManagerWebAPI.Import
                 if (!exists) gidByNameDob.TryAdd(NameDobKey(a.Name, ParseDate(a.Dob)), gid);
 
                 var currentLitter = exists && existingLitterByExtRef.TryGetValue(a.Id, out var el) ? el : null;
-                var currentColorVarietyId = exists && existingColorVarietyByExtRef.TryGetValue(a.Id, out var ecv) ? ecv : null;
-                plan.Add(new AnimalPlan(a, gid, exists, wurfLitterId, currentLitter, colorVarietyId, gender, currentColorVarietyId));
+                plan.Add(new AnimalPlan(a, gid, exists, wurfLitterId, currentLitter, colorVarietyId, gender));
             }
 
             // PASS 1.5: PEDIGREE-LINK — synthesize/reuse a litter from chart-position parentRefs for
@@ -509,78 +460,6 @@ namespace GerbilManagerWebAPI.Import
                 if (execute && parentFksBackfilled > 0) await _db.SaveChangesAsync();
             }
 
-            // FARBSCHLAG-RE-MATCH — no-op counter (safety mechanism pending god/Julian sign-off).
-            // Counts already-imported animals where the current extract matched a DIFFERENT
-            // ColorVariety than what is currently stored in the DB. Does NOT update any row.
-            int farbschlagWouldRebackfill = plan.Count(p =>
-                p.Exists && p.ColorVarietyId is not null && p.ColorVarietyId != p.CurrentColorVarietyId);
-
-            // CR-11: FARBSCHLAG FROM GENOTYPE post-sweep (fill-NULL-only, safe): existing DB animals
-            // with null ColorVarietyId whose stored Genotype matches a catalog entry get filled.
-            // Mirrors the plan-loop derivation; never overwrites a manually-set or name-matched value.
-            {
-                var noColor = await _db.Gerbils
-                    .Where(g => g.ColorVarietyId == null && g.Genotype != null)
-                    .Select(g => new { g.Id, g.Genotype })
-                    .ToListAsync();
-                foreach (var g in noColor)
-                {
-                    if (string.IsNullOrWhiteSpace(g.Genotype) || g.Genotype!.Contains("??")) continue;
-                    Guid? derivedVid = null;
-                    foreach (var v in varietiesWithGeno)
-                        if (!string.IsNullOrWhiteSpace(v.CanonicalGenotype)
-                            && GenotypePotentiallyMatches(g.Genotype, v.CanonicalGenotype))
-                        { derivedVid = v.Id; break; }
-                    if (derivedVid is null) continue;
-                    fbDerivedFromGenotype++;
-                    if (execute)
-                    {
-                        var row = await _db.Gerbils.FindAsync(g.Id);
-                        if (row is not null && row.ColorVarietyId is null) row.ColorVarietyId = derivedVid;
-                    }
-                }
-                if (execute && fbDerivedFromGenotype > 0) await _db.SaveChangesAsync();
-            }
-
-            // HERKUNFT BACKFILL (fill-NULL-only, safe): sweep all resident animals whose
-            // OriginBreeder is null and fill it with a derived value or 'Zucht der Kleinen Chaoten'.
-            // NEVER overwrites a non-null OriginBreeder (Julian: "alle Schreibweisen unterstützen").
-            const string DefaultClanBreeder = "Zucht der Kleinen Chaoten";
-            int herkunftBackfilled = 0;
-            {
-                var needsHerkunft = await _db.Gerbils
-                    .Where(g => g.OriginBreeder == null && g.IsResident)
-                    .Select(g => new { g.Id, g.LitterId })
-                    .ToListAsync();
-
-                foreach (var g in needsHerkunft)
-                {
-                    herkunftBackfilled++;
-                    if (execute)
-                    {
-                        // Prefer the OriginBreeder of an existing parent (father first, then mother).
-                        string? derived = null;
-                        if (g.LitterId is not null)
-                        {
-                            var parentIds = await _db.Litters
-                                .Where(l => l.Id == g.LitterId)
-                                .Select(l => new { l.FatherId, l.MotherId })
-                                .FirstOrDefaultAsync();
-                            if (parentIds?.FatherId is Guid fid)
-                                derived = await _db.Gerbils.Where(gb => gb.Id == fid && gb.OriginBreeder != null)
-                                    .Select(gb => gb.OriginBreeder).FirstOrDefaultAsync();
-                            if (derived is null && parentIds?.MotherId is Guid mid)
-                                derived = await _db.Gerbils.Where(gb => gb.Id == mid && gb.OriginBreeder != null)
-                                    .Select(gb => gb.OriginBreeder).FirstOrDefaultAsync();
-                        }
-                        var row = await _db.Gerbils.FindAsync(g.Id);
-                        if (row is not null && row.OriginBreeder is null)
-                            row.OriginBreeder = derived ?? DefaultClanBreeder;
-                    }
-                }
-                if (execute && herkunftBackfilled > 0) await _db.SaveChangesAsync();
-            }
-
             if (littersWithoutDate > 0)
                 notes.Add($"Würfe ohne Datum: {littersWithoutDate} Wurfchronik-Einträge ohne parsbares Geburtsdatum übersprungen (weder erstellt noch verknüpft).");
             notes.Add("Quarantäne (kein Import): Konflikte + Stubs ohne Geburtsdatum + unsichere Wurf-Zuordnungen — warten auf die Prüfung durch die Züchterin.");
@@ -590,15 +469,9 @@ namespace GerbilManagerWebAPI.Import
             if (parentFksBackfilled > 0)
                 notes.Add($"Parent-FK-Backfill: {parentFksBackfilled} bereits importierte Würfe haben jetzt eine Eltern-Verknüpfung (Elternteil war zuvor in Quarantäne, jetzt geladen).");
             notes.Add($"Bestand/Herkunft: {residentTotal} im Bestand (Clan Kleine Chaoten), {externalTotal} externe Ahnen ({flippedByParentRule} davon über die Eltern-Regel als Bestand erkannt).");
-            if (herkunftBackfilled > 0)
-                notes.Add($"Herkunft-Backfill: {herkunftBackfilled} Bestand-Tier(e) mit leerem Herkunft-Feld befüllt (Zucht der Kleinen Chaoten oder von Elternteil abgeleitet). Niemals überschrieben.");
-            if (farbschlagWouldRebackfill > 0)
-                notes.Add($"Farbschlag-Hinweis (kein Overwrite): {farbschlagWouldRebackfill} bereits importierte Tier(e) haben einen veralteten Farbschlag, den der aktuelle Extraktor korrigieren würde — Overwrite-Mechanismus ausstehend (god/Julian Freigabe).");
             int conflictsResolvedByDecision = loadable.Count(a => a.ResolvedByDecision);
             if (conflictsResolvedByDecision > 0)
                 notes.Add($"Konfliktauflösungen: {conflictsResolvedByDecision} Tier(e) anhand von conflict-decisions.json un-quarantänet (Genotyp/Farbschlag der Züchterin ist maßgeblich).");
-            if (fbDerivedFromGenotype > 0)
-                notes.Add($"Farbschlag aus Genotyp: {fbDerivedFromGenotype} Tier(e) ohne expliziten Farbschlag-Namen wurden über den Katalog-Genotyp-Abgleich zugeordnet (band-aware Deep-Band-Tiere).");
             if (!execute) notes.Add("DRY-RUN: nichts gespeichert. /import/execute lädt die konfliktfreien Daten.");
 
             return new ImportReport(
@@ -607,12 +480,11 @@ namespace GerbilManagerWebAPI.Import
                 Animals: new AnimalSummary(
                     animals.Count, animalsCreated, linked, fbMatched, fbUnmatched, animalsExisting,
                     new QuarantineSummary(conflicts, stubs, dateOnly, ambiguous, conflicts + stubs),
-                    parentLinksAdded, conflictsResolvedByDecision, fbDerivedFromGenotype),
+                    parentLinksAdded, conflictsResolvedByDecision),
                 Photos: new PhotoSummary(photosAttached, photosMissing),
                 Samples: samples,
                 Notes: notes,
-                Residency: new ResidencySummary(residentTotal, externalTotal, flippedByParentRule,
-                    HerkunftBackfilled: herkunftBackfilled, FarbschlagWouldRebackfill: farbschlagWouldRebackfill));
+                Residency: new ResidencySummary(residentTotal, externalTotal, flippedByParentRule));
         }
 
         private T? Load<T>(string file)
@@ -645,23 +517,6 @@ namespace GerbilManagerWebAPI.Import
 
         private static string StripCaret(string allele) => allele.Replace("^", "");
 
-        /// <summary>CR-11: check if a composed animal genotype is compatible with a catalog canonical
-        /// genotype. Both are space-separated 8-locus tokens (e.g. "aa CC DD ee GG PP spsp rere").
-        /// "??" in either position is a wildcard. The first 8 tokens are compared; any trailing
-        /// Sls token is ignored (it is outside the base 8-locus contract).</summary>
-        private static bool GenotypePotentiallyMatches(string animalGeno, string catalogGeno)
-        {
-            var a = animalGeno.Split(' ', StringSplitOptions.RemoveEmptyEntries);
-            var c = catalogGeno.Split(' ', StringSplitOptions.RemoveEmptyEntries);
-            if (a.Length < 8 || c.Length < 8) return false;
-            for (int i = 0; i < 8; i++)
-            {
-                if (a[i] == "??" || c[i] == "??") continue;
-                if (!string.Equals(a[i], c[i], StringComparison.OrdinalIgnoreCase)) return false;
-            }
-            return true;
-        }
-
         private static Gender InferGender(SourceAnimal a, HashSet<string> sires, HashSet<string> dams)
         {
             // Box colour (blue=male, white=female) is the authoritative breeder signal — prefer it
@@ -719,8 +574,7 @@ namespace GerbilManagerWebAPI.Import
         /// <summary>Per-animal plan computed before any write so synthesis can run in dry-run too.</summary>
         private sealed record AnimalPlan(
             SourceAnimal A, Guid Gid, bool Exists, Guid? WurfLitterId,
-            Guid? CurrentLitterId, Guid? ColorVarietyId, Gender Gender,
-            Guid? CurrentColorVarietyId = null);
+            Guid? CurrentLitterId, Guid? ColorVarietyId, Gender Gender);
 
         /// <summary>A litter synthesized from chart-position parentRefs (PEDIGREE-LINK).</summary>
         private sealed record SynthLitter(Guid Id, Guid? Father, Guid? Mother, DateOnly? Date, string Confidence);

GerbilManagerWebAPI/Migrations/20260606154816_UniqueExternalRef.cs

@@ -1,29 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace GerbilManagerWebAPI.Migrations
-{
-    /// <inheritdoc />
-    public partial class UniqueExternalRef : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateIndex(
-                name: "IX_Gerbils_ExternalRef",
-                table: "Gerbils",
-                column: "ExternalRef",
-                unique: true,
-                filter: "\"ExternalRef\" IS NOT NULL");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_Gerbils_ExternalRef",
-                table: "Gerbils");
-        }
-    }
-}

GerbilManagerWebAPI/Migrations/20260606174843_AddGermanCollation.cs

@@ -1,133 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace GerbilManagerWebAPI.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddGermanCollation : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "ExternalRef",
-                table: "Litters",
-                type: "text",
-                nullable: true);
-
-            migrationBuilder.AlterColumn<string>(
-                name: "OriginBreeder",
-                table: "Gerbils",
-                type: "text",
-                nullable: true,
-                collation: "de-x-icu",
-                oldClrType: typeof(string),
-                oldType: "text",
-                oldNullable: true);
-
-            migrationBuilder.AlterColumn<string>(
-                name: "NameSearch",
-                table: "Gerbils",
-                type: "text",
-                nullable: true,
-                collation: "de-x-icu",
-                oldClrType: typeof(string),
-                oldType: "text",
-                oldNullable: true);
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Name",
-                table: "Gerbils",
-                type: "text",
-                nullable: false,
-                collation: "de-x-icu",
-                oldClrType: typeof(string),
-                oldType: "text");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Name",
-                table: "Contacts",
-                type: "text",
-                nullable: false,
-                collation: "de-x-icu",
-                oldClrType: typeof(string),
-                oldType: "text");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Name",
-                table: "ColorVarieties",
-                type: "text",
-                nullable: false,
-                collation: "de-x-icu",
-                oldClrType: typeof(string),
-                oldType: "text");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Litters_ExternalRef",
-                table: "Litters",
-                column: "ExternalRef",
-                unique: true,
-                filter: "\"ExternalRef\" IS NOT NULL");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropIndex(
-                name: "IX_Litters_ExternalRef",
-                table: "Litters");
-
-            migrationBuilder.DropColumn(
-                name: "ExternalRef",
-                table: "Litters");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "OriginBreeder",
-                table: "Gerbils",
-                type: "text",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "text",
-                oldNullable: true,
-                oldCollation: "de-x-icu");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "NameSearch",
-                table: "Gerbils",
-                type: "text",
-                nullable: true,
-                oldClrType: typeof(string),
-                oldType: "text",
-                oldNullable: true,
-                oldCollation: "de-x-icu");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Name",
-                table: "Gerbils",
-                type: "text",
-                nullable: false,
-                oldClrType: typeof(string),
-                oldType: "text",
-                oldCollation: "de-x-icu");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Name",
-                table: "Contacts",
-                type: "text",
-                nullable: false,
-                oldClrType: typeof(string),
-                oldType: "text",
-                oldCollation: "de-x-icu");
-
-            migrationBuilder.AlterColumn<string>(
-                name: "Name",
-                table: "ColorVarieties",
-                type: "text",
-                nullable: false,
-                oldClrType: typeof(string),
-                oldType: "text",
-                oldCollation: "de-x-icu");
-        }
-    }
-}

GerbilManagerWebAPI/Migrations/20260606174848_AddLitterExternalRef.cs

@@ -1,22 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace GerbilManagerWebAPI.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddLitterExternalRef : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-
-        }
-    }
-}

GerbilManagerWebAPI/Migrations/20260606185411_AddLitterLetter.cs

@@ -1,28 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace GerbilManagerWebAPI.Migrations
-{
-    /// <inheritdoc />
-    public partial class AddLitterLetter : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "LitterLetter",
-                table: "Litters",
-                type: "text",
-                nullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "LitterLetter",
-                table: "Litters");
-        }
-    }
-}

GerbilManagerWebAPI/Migrations/ApplicationContextModelSnapshot.cs

@@ -201,8 +201,7 @@ namespace GerbilManagerWebAPI.Migrations
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("text")
-                        .UseCollation("de-x-icu");
+                        .HasColumnType("text");
 
                     b.Property<int>("SortOrder")
                         .HasColumnType("integer");
@@ -690,8 +689,7 @@ namespace GerbilManagerWebAPI.Migrations
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("text")
-                        .UseCollation("de-x-icu");
+                        .HasColumnType("text");
 
                     b.Property<string>("Notes")
                         .HasColumnType("text");
@@ -779,19 +777,16 @@ namespace GerbilManagerWebAPI.Migrations
 
                     b.Property<string>("Name")
                         .IsRequired()
-                        .HasColumnType("text")
-                        .UseCollation("de-x-icu");
+                        .HasColumnType("text");
 
                     b.Property<string>("NameSearch")
-                        .HasColumnType("text")
-                        .UseCollation("de-x-icu");
+                        .HasColumnType("text");
 
                     b.Property<string>("Notes")
                         .HasColumnType("text");
 
                     b.Property<string>("OriginBreeder")
-                        .HasColumnType("text")
-                        .UseCollation("de-x-icu");
+                        .HasColumnType("text");
 
                     b.Property<Guid?>("OriginContactId")
                         .HasColumnType("uuid");
@@ -812,10 +807,6 @@ namespace GerbilManagerWebAPI.Migrations
 
                     b.HasIndex("EnclosureId");
 
-                    b.HasIndex("ExternalRef")
-                        .IsUnique()
-                        .HasFilter("\"ExternalRef\" IS NOT NULL");
-
                     b.HasIndex("LitterId");
 
                     b.HasIndex("OriginContactId");
@@ -899,15 +890,9 @@ namespace GerbilManagerWebAPI.Migrations
                     b.Property<DateOnly?>("ExpectedGoHomeDate")
                         .HasColumnType("date");
 
-                    b.Property<string>("ExternalRef")
-                        .HasColumnType("text");
-
                     b.Property<Guid?>("FatherId")
                         .HasColumnType("uuid");
 
-                    b.Property<string>("LitterLetter")
-                        .HasColumnType("text");
-
                     b.Property<Guid?>("MotherId")
                         .HasColumnType("uuid");
 
@@ -926,10 +911,6 @@ namespace GerbilManagerWebAPI.Migrations
 
                     b.HasKey("Id");
 
-                    b.HasIndex("ExternalRef")
-                        .IsUnique()
-                        .HasFilter("\"ExternalRef\" IS NOT NULL");
-
                     b.HasIndex("FatherId");
 
                     b.HasIndex("MotherId");

GerbilManagerWebAPI/Models/Litter.cs

@@ -25,14 +25,5 @@ namespace GerbilManagerWebAPI.Models
         /// <summary>Zuchtnummer der Verpaarung (Wurfchronik col H) — pairing-level code;
         /// litters sharing it are the same Zuchtpaar. Set by the FEAT-8 import.</summary>
         public string? PairingCode { get; set; }
-
-        /// <summary>DB-5: stable import source id (extract.py litter Id). Unique (filtered,
-        /// nulls allowed for manually-entered litters). Primary idempotency key for re-imports;
-        /// Name+Date is the fallback for litters created before this column existed.</summary>
-        public string? ExternalRef { get; set; }
-
-        /// <summary>FEAT-NAMEGEN: Wurfbuchstabe (A, B, C … AA, AB …) — alle Welpen dieses
-        /// Wurfs erhalten Namen mit diesem Anfangsbuchstaben (gängige Zuchtkonvention).</summary>
-        public string? LitterLetter { get; set; }
     }
 }

GerbilManagerWebAPI/Names/NameSuggestion.cs

@@ -1,5 +0,0 @@
-namespace GerbilManagerWebAPI.Names
-{
-    /// <summary>FEAT-NAMEGEN: a single name suggestion returned by GET /names/suggest.</summary>
-    public sealed record NameSuggestion(string Name, string Meaning, string Origin);
-}

GerbilManagerWebAPI/Names/NameSuggestionService.cs

@@ -1,107 +0,0 @@
-using System.Text;
-using System.Text.Json;
-using GerbilManagerWebAPI.Ai;
-using GerbilManagerWebAPI.SaleAd;
-using Microsoft.Extensions.Options;
-
-namespace GerbilManagerWebAPI.Names
-{
-    /// <summary>
-    /// FEAT-NAMEGEN: generates meaningful gerbil name suggestions via Gemini
-    /// (the same OpenAiChatClient used by sale-ads and reply-drafts).
-    /// Returns NotConfigured when the AI section is missing — callers map to 503.
-    /// </summary>
-    public sealed class NameSuggestionService(HttpClient http, IOptions<AiOptions> options)
-    {
-        private readonly OpenAiChatClient _client = new(http, options);
-
-        private static readonly JsonSerializerOptions JsonOpts = new()
-        {
-            PropertyNameCaseInsensitive = true,
-        };
-
-        public async Task<NameSuggestionResult> SuggestAsync(
-            string? letter, string? gender, string? usages, int count,
-            CancellationToken ct = default)
-        {
-            var aiResult = await _client.CompleteAsync(
-                BuildSystemPrompt(),
-                BuildUserPrompt(letter, gender, usages, count),
-                ct);
-
-            if (aiResult.Status == AiCallStatus.NotConfigured)
-                return new NameSuggestionResult(NameSuggestionStatus.NotConfigured, null, aiResult.Error);
-            if (aiResult.Status != AiCallStatus.Ok || aiResult.Text is null)
-                return new NameSuggestionResult(NameSuggestionStatus.UpstreamError, null, aiResult.Error);
-
-            var suggestions = ParseSuggestions(aiResult.Text);
-            return suggestions is null
-                ? new NameSuggestionResult(NameSuggestionStatus.UpstreamError, null, "Ungültiges JSON in KI-Antwort.")
-                : new NameSuggestionResult(NameSuggestionStatus.Ok, suggestions, null);
-        }
-
-        internal static string BuildSystemPrompt() =>
-            "Du bist ein Helfer für Rennmaus-Züchter. " +
-            "Antworte IMMER mit einem reinen JSON-Array — KEINE Markdown-Code-Blöcke, " +
-            "KEINE Erklärungen, KEIN Text außerhalb des Arrays. " +
-            "Jedes Element hat genau die Felder: name, meaning, origin (alle Strings, alle auf Deutsch).";
-
-        internal static string BuildUserPrompt(string? letter, string? gender, string? usages, int count)
-        {
-            var sb = new StringBuilder();
-            sb.Append($"Schlage {count} Rennmaus-Namen vor");
-            if (!string.IsNullOrWhiteSpace(letter))
-                sb.Append($" die mit dem Buchstaben \"{letter.ToUpperInvariant()}\" beginnen");
-            if (!string.IsNullOrWhiteSpace(gender) &&
-                !gender.Equals("any", StringComparison.OrdinalIgnoreCase))
-                sb.Append($", passend für {(gender.Equals("female", StringComparison.OrdinalIgnoreCase) ? "weibliche" : "männliche")} Tiere");
-            if (!string.IsNullOrWhiteSpace(usages))
-                sb.Append($", aus den Kulturkreisen: {usages}");
-            sb.Append(". Jeder Name muss eine echte etymologische Bedeutung und Herkunft haben ");
-            sb.Append("(keine erfundenen oder zufälligen Namen). ");
-            sb.Append($"Antworte mit genau {count} Elementen als reines JSON-Array: ");
-            sb.Append("[{\"name\":\"...\",\"meaning\":\"...\",\"origin\":\"...\"}]");
-            return sb.ToString();
-        }
-
-        /// <summary>
-        /// Strips optional markdown fences (```json ... ```) Gemini sometimes wraps around
-        /// its JSON output, then deserialises the array.
-        /// </summary>
-        internal static List<NameSuggestion>? ParseSuggestions(string raw)
-        {
-            var text = raw.Trim();
-
-            // Strip ```json ... ``` or ``` ... ``` fences.
-            if (text.StartsWith("```", StringComparison.Ordinal))
-            {
-                var firstNewline = text.IndexOf('\n');
-                if (firstNewline >= 0) text = text[(firstNewline + 1)..];
-                if (text.EndsWith("```", StringComparison.Ordinal))
-                    text = text[..^3].TrimEnd();
-            }
-
-            // Find the JSON array bounds defensively.
-            var start = text.IndexOf('[');
-            var end = text.LastIndexOf(']');
-            if (start < 0 || end <= start) return null;
-            text = text[start..(end + 1)];
-
-            try
-            {
-                return JsonSerializer.Deserialize<List<NameSuggestion>>(text, JsonOpts);
-            }
-            catch (JsonException)
-            {
-                return null;
-            }
-        }
-    }
-
-    public enum NameSuggestionStatus { Ok, NotConfigured, UpstreamError }
-
-    public sealed record NameSuggestionResult(
-        NameSuggestionStatus Status,
-        List<NameSuggestion>? Suggestions,
-        string? Error);
-}

GerbilManagerWebAPI/Program.cs

@@ -1,6 +1,5 @@
 using System.Text.Json.Serialization;
 using GerbilManagerWebAPI.Endpoints;
-using Microsoft.AspNetCore.DataProtection;
 using Microsoft.EntityFrameworkCore;
 using Scalar.AspNetCore;
 
@@ -45,22 +44,9 @@ builder.Services.AddHttpClient<GerbilManagerWebAPI.SaleAd.SaleAdService>(
 // INBOX-2: KI-Antwortentwurf (gleiche AI-Sektion, gleicher Wire-Client).
 builder.Services.AddHttpClient<GerbilManagerWebAPI.Inbox.DraftReplyService>(
     http => http.Timeout = TimeSpan.FromSeconds(60));
-// FEAT-NAMEGEN: Name suggestions via Gemini (same AI section, same wire client).
-builder.Services.AddHttpClient<GerbilManagerWebAPI.Names.NameSuggestionService>(
-    http => http.Timeout = TimeSpan.FromSeconds(60));
 
 // INBOX-0: Gmail inbox. App Password encrypted at rest via Data Protection.
-// AR-3: persist the key ring so encrypted passwords survive image redeployments.
-// In prod the path is mounted to a persistent volume (compose DataProtection__KeyRingPath).
-// In dev (Aspire) keys live in the content root — ephemeral, which is fine there.
-{
-    var keyRingPath = builder.Configuration["DataProtection:KeyRingPath"]
-        ?? Path.Combine(builder.Environment.ContentRootPath, ".data-protection-keys");
-    Directory.CreateDirectory(keyRingPath);
-    builder.Services.AddDataProtection()
-        .PersistKeysToFileSystem(new DirectoryInfo(keyRingPath))
-        .SetApplicationName("GerbilManager");
-}
+builder.Services.AddDataProtection();
 builder.Services.AddScoped<GerbilManagerWebAPI.Inbox.MailSettingsService>();
 builder.Services.AddScoped<GerbilManagerWebAPI.Inbox.IGmailMailReader, GerbilManagerWebAPI.Inbox.GmailMailReader>();
 builder.Services.AddScoped<GerbilManagerWebAPI.Inbox.RequestSyncService>();
@@ -103,7 +89,6 @@ app.MapSettingsEndpoints();
 app.MapExportEndpoints();
 app.MapCmsEndpoints();
 app.MapRequestEndpoints();
-app.MapNamesEndpoints();
 
 app.Run();
 

HUMANQUESTION.md

@@ -20,8 +20,8 @@ hinterlegt ist. Jede offene Frage unten zeigt, **was dadurch blockiert ist**.
 
 | # | Was gebraucht wird | Wofür / was es freischaltet | Blockiert gerade |
 |---|---|---|---|
-| ~~A1~~ | ✅ **ERLEDIGT (2026-06-07): Gemini-Key hinterlegt** (user-secrets, nie committed) + LIVE verifiziert — Verkaufstext-Endpunkt generiert echten Text. KI-Verkaufstexte + Charakterbogen-KI sind **live**. (Namensgenerator live sobald Backend gemerged; Posteingang braucht zusätzlich A3 Gmail; Web-Chat-Editor wenn gebaut.) | — | — |
-| ~~A2~~ | ✅ **ERLEDIGT (2026-06-07): KOSTENLOS, kein Billing nötig.** `gemini-2.0-flash` hatte kein Free-Kontingent (429), aber **`gemini-flash-latest` funktioniert im Free-Tier** (direkt + live verifiziert). Modell überall darauf umgestellt. Julian bleibt gratis. (Falls je volle Privatsphäre gewünscht: Ollama-Option steht.) | — | — |
+| A1 | **Gemini API-Schlüssel** (aistudio.google.com → „API-Schlüssel erstellen"). | Schaltet **vier Funktionen auf einmal** frei | KI-Verkaufstexte, Charakterbogen-KI (fertig, schläft), Webseiten-Chat-Editor, KI-Antwortentwürfe im Posteingang |
+| A2 | **Abrechnung aktivieren? (EU/Deutschland)** Die Gemini-AGB verlangen für EU-Nutzer die **bezahlte Stufe** — bei eurem Volumen **praktisch 0 €**, aber eure Daten werden dann **nicht** zum Training genutzt. Empfehlung: **Abrechnung einschalten** (bleibt fast gratis). Alternative für volle Privatsphäre: lokales Modell (Ollama). | Datenschutz (v. a. E-Mail-Inhalte) + AGB-konform | dieselben KI-Funktionen wie A1 |
 | A3 | **Gmail App-Passwort.** Einmalig: Google-Konto → 2-Faktor-Bestätigung aktivieren → „App-Passwörter" → eines für „GerbilManager" erstellen → 16-stelligen Code an Michael. | Posteingang verbinden (Anfragen abrufen + Antworten senden) | E-Mail-Posteingang (live) |
 | A4 | **Domain-Name** (ist registriert ✔) + **Cloudflare-Konto & API-Token** (Berechtigung „Cloudflare Pages → Edit"). | Öffentliche Webseite auf Cloudflare veröffentlichen | Veröffentlichung der neuen Webseite (Ersatz für Jimdo) |
 | A5 | **TrueNAS / Gitea — Restfragen:** ~~(b) Gitea Actions?~~ ✅ **AKTIV seit 06.06. — CI läuft bereits** (Runner registriert, Backend+Frontend-Tests grün auf dem Runner). **NEU (b2): Docker-Push-Job braucht 2 Repo-Secrets** — in Gitea → Repo → Einstellungen → Actions → Secrets bitte `REGISTRY_USER` (dein Gitea-Login) und `REGISTRY_TOKEN` (Token mit `write:package`) anlegen, dann pusht die CI fertige Images in die Registry. Offen bleiben: (a) TrueNAS SCALE-Version? (c) Eigener Postgres-Container (empfohlen) oder bestehender NAS-Postgres? (d) Dataset-Pfad für Daten/Backups, Port 80 frei? | Manager auf dem NAS betreiben (Produktiv + Backups + CI) | NAS-Deployment (compose fertig; CI ✅ live) |
@@ -126,10 +126,10 @@ Bitte je Tier sagen, **welcher Wert stimmt** (die Quellen widersprechen sich bei
 | Tier | Konkreter Konflikt — was stimmt? |
 |---|---|
 | Hanami v.d. K.C. (*10.09.2015) | Sterbedatum: **12.12.2019** ↔ **14.01.2020** (= D5) |
-| ~~Little Runner's Big Ben (*03.02.2020)~~ | ✅ **Pp** (P-Locus) — Julian 2026-06-07 → in conflict-decisions.json |
-| ~~Vance Jr. v.d. K.C. (*10.04.2022)~~ | ✅ **spsp** (ungescheckt) — Julian 2026-06-07 → in conflict-decisions.json |
-| ~~Kazu v.d. K.C. (*23.04.2013)~~ | ✅ **ee[f] · GG · PP** — Julian 2026-06-07 → in conflict-decisions.json |
-| ~~Skarlett v.d. K.C. (*14.07.2013)~~ | ✅ **Sterbedatum 17.04.2016** — Julian 2026-06-07 → in conflict-decisions.json |
+| Little Runner's Big Ben (*03.02.2020) | P-Locus: **PP** ↔ **Pp** |
+| Vance Jr. v.d. K.C. (*10.04.2022) | Scheckung: **Spsp** ↔ **spsp** (Schecke ja/nein) |
+| Kazu v.d. K.C. (*23.04.2013) | E-Locus: **e[f]e[f]** ↔ **ee[f]** · G-Locus: **Gg** ↔ **GG** · P-Locus: **P?** ↔ **PP** |
+| Skarlett v.d. K.C. (*14.07.2013) | Sterbedatum: **17.04.2016** ↔ **2018** |
 
 *(Enya, Ella und Zac fehlen hier bewusst: deren Abweichung ist nur „unbekannt ↔ genau angegeben" — löst der Importer automatisch mit der „genauer gewinnt"-Regel.)*
 

deploy/truenas/.env.example

@@ -1,4 +1,4 @@
-# GerbilManager Produktionskonfiguration
+# GerbilManager Produktionskonfiguration
 # Kopiere diese Datei nach .env und setze die Werte vor dem ersten Start.
 
 # Sicheres Datenbankpasswort (mind. 20 Zeichen, keine Anführungszeichen)
@@ -15,15 +15,9 @@ TAG=latest
 PGDATA_PATH=/mnt/SSD/gerbil/pgdata
 PHOTOS_PATH=/mnt/SSD/gerbil/photos
 BACKUPS_PATH=/mnt/SSD/gerbil/backups
-# AR-3: Data Protection Key-Ring (Gmail-App-Passwort-Verschlüsselung)
-KEYS_PATH=/mnt/SSD/gerbil/keys
 
 # Backup-Rotation: Anzahl Tage (Standard: 7)
 BACKUP_KEEP_DAYS=7
 
-# KI-Funktionen (Verkaufstext + Posteingang-Entwurf)
-# Beliebiger OpenAI-kompatibler Anbieter — Optionen in docs/ai-provider.md
-# Leer lassen = KI deaktiviert (kein Fehler, nur 503 AiKeyMissing)
-AI__BaseUrl=
-AI__ApiKey=
-AI__Model=gemini-flash-latest
+# Claude-API-Key fuer KI-Verkaufstext (FEAT-12a; leer lassen wenn nicht vorhanden)
+ANTHROPIC_API_KEY=

deploy/truenas/compose.yaml

@@ -1,4 +1,4 @@
-# GerbilManager — TrueNAS Custom Application
+# GerbilManager — TrueNAS Custom Application
 # ==============================================
 # Vor dem ersten Start:
 #   1. Kopiere deploy/truenas/.env.example -> deploy/truenas/.env und setze die Werte.
@@ -40,17 +40,10 @@ services:
       ConnectionStrings__gerbilmanager: "Host=db;Port=5432;Database=gerbilmanager;Username=postgres;Password=${POSTGRES_PASSWORD}"
       # Speicherort der hochgeladenen Fotos (NAS-Dataset gemounted unter /data/photos)
       Photos__RootPath: /data/photos
-      # AR-3: Data Protection Key-Ring (persistiert Gmail-App-Passwort-Verschlüsselung über Redeployments)
-      DataProtection__KeyRingPath: /data/keys
-      # AR-4: KI-Funktionen (Verkaufstext + Posteingang-Entwurf, Sektion AI; beliebiger OpenAI-kompatibler Anbieter)
-      # Anbieter-Optionen und Schlüssel-Beispiele: docs/ai-provider.md
-      # Leer lassen = KI deaktiviert (503 AiKeyMissing statt Fehler)
-      AI__BaseUrl: "${AI__BaseUrl:-}"
-      AI__ApiKey: "${AI__ApiKey:-}"
-      AI__Model: "${AI__Model:-gemini-flash-latest}"
+      # KI-Verkaufstext (FEAT-12a stub; leer lassen wenn kein Key vorhanden)
+      ANTHROPIC_API_KEY: "${ANTHROPIC_API_KEY:-}"
     volumes:
       - photos:/data/photos
-      - keys:/data/keys
     depends_on:
       db:
         condition: service_healthy
@@ -108,14 +101,6 @@ volumes:
       type: none
       o: bind
       device: "${PHOTOS_PATH:-/mnt/gerbil/photos}"
-  # AR-3: Data Protection key ring — persistiert Gmail-App-Passwort-Verschlüsselung.
-  # Muss ein persistentes NAS-Dataset sein (nicht dasselbe wie photos).
-  keys:
-    driver: local
-    driver_opts:
-      type: none
-      o: bind
-      device: "${KEYS_PATH:-/mnt/gerbil/keys}"
   backups:
     driver: local
     driver_opts:

docs/ai-provider.md

@@ -1,4 +1,4 @@
-# KI-Anbieter für das Abgabe-Inserat (FEAT-12a)
+# KI-Anbieter für das Abgabe-Inserat (FEAT-12a)
 
 `POST /gerbils/sale-ad` spricht einen beliebigen **OpenAI-kompatiblen**
 Chat-Completions-Endpunkt an — kein SDK, nur drei Einstellungen (Sektion `AI`),
@@ -16,7 +16,7 @@ committen**. Fehlt eine der drei, antwortet der Endpunkt mit
 
 | Anbieter | `AI__BaseUrl` | Beispiel-`AI__Model` | Kosten |
 |---|---|---|---|
-| **Google Gemini** (vermutlich Julians Wahl) | `https://generativelanguage.googleapis.com/v1beta/openai` | `gemini-flash-latest` | Free Tier |
+| **Google Gemini** (vermutlich Julians Wahl) | `https://generativelanguage.googleapis.com/v1beta/openai` | `gemini-2.0-flash` | Free Tier |
 | **Groq** | `https://api.groq.com/openai/v1` | `llama-3.3-70b-versatile` | Free Tier |
 | **Mistral** | `https://api.mistral.ai/v1` | `mistral-small-latest` | Free Tier |
 | **Ollama** (lokal/TrueNAS) | `http://<host>:11434/v1` | `llama3.2` | kostenlos, lokal |
@@ -31,7 +31,7 @@ Ollama ignoriert den Schlüssel — `AI__ApiKey=ollama` als Platzhalter setzen
 ```powershell
 $env:AI__BaseUrl = 'https://generativelanguage.googleapis.com/v1beta/openai'
 $env:AI__ApiKey  = '<schlüssel>'
-$env:AI__Model   = 'gemini-flash-latest'
+$env:AI__Model   = 'gemini-2.0-flash'
 ```
 
 oder per user-secrets im API-Projekt:
@@ -46,5 +46,5 @@ services:
     environment:
       AI__BaseUrl: https://generativelanguage.googleapis.com/v1beta/openai
       AI__ApiKey: ${AI_API_KEY}        # Wert in der TrueNAS-App/.env hinterlegen
-      AI__Model: gemini-flash-latest
+      AI__Model: gemini-2.0-flash
 ```

gerbil-manager-web/e2e/gehege-regression.spec.ts

@@ -1,90 +0,0 @@
-/**
- * QA-REGRESSION-1: GEHEGE-RENAME Lock-in.
- *
- * Sichert das Verhalten von drei GEHEGE-RENAME-Änderungen ab, die leicht still
- * brechen können (Redirects, Nav-Einträge, Landing-URL):
- *  (a) /becken/* → /gehege/* Redirect (bookmarks / externe Links)
- *  (b) Nav zeigt 'Gehege' + 🏜️, kein 'Becken', kein 'Start'-Eintrag
- *  (c) '/' (Index) landet auf /rennmaeuse (nicht mehr auf einer Startseite)
- *
- * Bereits abgedeckt (NICHT dupliziert):
- *  - gotoSection(de.nav.enclosures) navigiert zu Gehege-Heading: navigation.spec.ts:19-20
- *  - CRUD + 409 auf /gehege: becken-kontakte.spec.ts
- *  - Wurf-Link + Herkunft: tiere.spec.ts:101-128
- */
-import { de, expect, test } from './fixtures'
-
-// ── (a) /becken/* → /gehege/* Redirect ──────────────────────────────────────
-
-test('GEHEGE-RENAME: /becken leitet auf /gehege weiter (bookmark-safe)', async ({ page }) => {
-  await page.goto('/becken')
-  // React Router BeckenRedirect navigiert → /gehege; Gehege-Heading muss sichtbar sein
-  await expect(page.getByRole('heading', { name: de.pages.becken.title, exact: true })).toBeVisible()
-  await expect(page).toHaveURL(/\/gehege$/)
-})
-
-test('GEHEGE-RENAME: /becken/neu leitet auf /gehege/neu weiter (deep redirect)', async ({
-  page,
-}) => {
-  await page.goto('/becken/neu')
-  // Neues-Gehege-Formular muss sichtbar sein, URL muss /gehege/neu sein
-  await expect(page.getByRole('heading', { name: de.pages.becken.form?.createTitle ?? de.pages.becken.newButton })).toBeVisible({ timeout: 6_000 })
-  await expect(page).toHaveURL(/\/gehege\/neu$/)
-})
-
-// ── (b) Nav: 'Gehege' ✓, 'Becken' ✗, 'Start' ✗ ──────────────────────────────
-
-test('GEHEGE-RENAME: Nav hat "Gehege"-Eintrag mit Terrarium-Icon, kein "Becken"', async ({
-  page,
-}) => {
-  await page.goto('/rennmaeuse')
-  const nav = page.getByRole('navigation', { name: de.nav.mainNavigation })
-
-  // Gehege-Link soll vorhanden sein (via „Mehr"-Blatt auf Phone oder direkt auf Desktop)
-  // Wir öffnen „Mehr" um sekundäre Links sichtbar zu machen
-  const moreBtn = nav.getByRole('button', { name: de.nav.more })
-  if (await moreBtn.isVisible()) {
-    await moreBtn.click()
-  }
-  await expect(nav.getByRole('link', { name: de.nav.enclosures })).toBeVisible()
-  // "Becken" als separater Nav-Eintrag darf nicht mehr existieren
-  await expect(nav.getByRole('link', { name: 'Becken', exact: true })).toBeHidden()
-})
-
-test('GEHEGE-RENAME: Nav hat keinen "Start"-Eintrag mehr (de.nav.home entfernt)', async ({
-  page,
-}) => {
-  await page.goto('/rennmaeuse')
-  // Warten bis die Tierliste geladen ist, dann Nav prüfen
-  await expect(page.getByRole('heading', { name: de.pages.gerbils.title, exact: true })).toBeVisible()
-  const nav = page.getByRole('navigation', { name: de.nav.mainNavigation })
-  // 'Start' (de.nav.home wurde entfernt) darf kein Nav-Link mehr sein
-  await expect(nav.getByRole('link', { name: 'Start', exact: true })).toBeHidden()
-})
-
-// ── (c) '/' landet auf /rennmaeuse ──────────────────────────────────────────
-
-test('GEHEGE-RENAME: "/" leitet auf /rennmaeuse weiter — keine Startseite mehr', async ({
-  page,
-}) => {
-  await page.goto('/')
-  // URL muss /rennmaeuse sein (Navigate replace)
-  await expect(page).toHaveURL(/\/rennmaeuse$/)
-  // Tierliste-Heading sichtbar — nicht die alte Startseite
-  await expect(
-    page.getByRole('heading', { name: de.pages.gerbils.title, exact: true }),
-  ).toBeVisible()
-  // Alten Willkommen-Text darf es nicht mehr geben (de.pages.home wurde entfernt)
-  await expect(page.getByText('Willkommen')).toBeHidden()
-})
-
-test('GEHEGE-RENAME: 404-Seite "Zur Startseite" landet weiterhin auf Tierliste', async ({
-  page,
-}) => {
-  await page.goto('/diese-seite-gibt-es-nicht')
-  await expect(page.getByText(de.pages.notFound.message)).toBeVisible()
-  await page.getByRole('link', { name: de.pages.notFound.backHome }).click()
-  // Nach Klick auf "Zur Startseite" → '/' → redirect → /rennmaeuse
-  await expect(page.getByRole('heading', { name: de.pages.gerbils.title, exact: true })).toBeVisible()
-  await expect(page).toHaveURL(/\/rennmaeuse$/)
-})

gerbil-manager-web/e2e/mock-api.ts

@@ -361,26 +361,6 @@ export async function installMockApi(page: Page): Promise<MockDb> {
       return json(route, 201, contract)
     }
 
-    // FEAT-NAMEGEN: /names/suggest
-    if (path === '/names/suggest' && method === 'GET') {
-      if (!db.namesConfigured) {
-        return json(route, 503, { code: 'NamesKeyMissing', message: 'Kein API-Key konfiguriert' })
-      }
-      const letter = url.searchParams.get('letter')?.toUpperCase()
-      const allSuggestions = [
-        { name: 'Fenrir', meaning: 'Wolf aus der Nordischen Mythologie', origin: 'Nordisch' },
-        { name: 'Freya', meaning: 'Göttin der Liebe und Fruchtbarkeit', origin: 'Nordisch' },
-        { name: 'Artemis', meaning: 'Göttin der Jagd und des Mondlichts', origin: 'Griech. Mythologie' },
-        { name: 'Kira', meaning: 'Strahlendes Licht', origin: 'Japanisch' },
-        { name: 'Luna', meaning: 'Mondgöttin', origin: 'Griech. Mythologie' },
-        { name: 'Baldur', meaning: 'Gott des Lichts und der Reinheit', origin: 'Nordisch' },
-      ]
-      const result = letter
-        ? allSuggestions.filter((s) => s.name.startsWith(letter))
-        : allSuggestions
-      return json(route, 200, result)
-    }
-
     // Generische Kollektionen: /<resource> und /<resource>/<id>
     m = path.match(/^\/([a-z-]+)(?:\/([^/]+))?$/)
     const col = m ? collections[m[1]] : undefined

gerbil-manager-web/e2e/mock-data.ts

@@ -74,8 +74,6 @@ export interface MockDb {
   // ABGABE: Verträge + KI-Inserat-Flag
   contracts: MockContract[]
   saleAdConfigured: boolean
-  // FEAT-NAMEGEN: Namensvorschläge — false = 503 NamesKeyMissing simulieren
-  namesConfigured: boolean
 }
 
 function gerbil(
@@ -151,8 +149,6 @@ export function seedDb(): MockDb {
       enclosureId: 'enc-leer',
       notes: 'neugieriger Entdecker',
     },
-    // UI-POLISH-1: Import-Stub ohne Namen — testet den '(ohne Namen)'-Platzhalter in Liste + Detail.
-    gerbil('nameless-stub', '', 'male', '2023-01-01', null, null),
   ]
 
   const litters: Litter[] = [
@@ -294,6 +290,5 @@ export function seedDb(): MockDb {
     mailConfigured: true,
     contracts: [],
     saleAdConfigured: true,
-    namesConfigured: true,
   }
 }

gerbil-manager-web/e2e/namegen.spec.ts

@@ -1,59 +0,0 @@
-/** FEAT-NAMEGEN: UC-1 — 'Name vorschlagen'-Panel auf der GerbilFormPage. */
-import { de, expect, skipUnlessMock, test } from './fixtures'
-
-const t = de.namegen
-const tf = de.pages.gerbils.form
-
-test('Name-vorschlagen-Panel öffnet sich und zeigt Vorschläge (FEAT-NAMEGEN)', async ({ page }) => {
-  skipUnlessMock()
-  await page.goto('/rennmaeuse/neu')
-  await expect(page.getByRole('heading', { name: tf.createTitle })).toBeVisible()
-
-  // Panel öffnen
-  await page.getByRole('button', { name: t.button }).click()
-  await expect(page.getByText(t.panelTitle)).toBeVisible()
-
-  // Vorschläge laden
-  await page.getByRole('button', { name: t.loadButton }).click()
-  // Fenrir ist im Mock immer dabei (kein Buchstabe-Filter)
-  await expect(page.getByRole('button', { name: 'Fenrir' })).toBeVisible()
-  await expect(page.getByText('Wolf aus der Nordischen Mythologie')).toBeVisible()
-})
-
-test('Klick auf Vorschlag befüllt Namensfeld und schließt Panel (FEAT-NAMEGEN)', async ({ page }) => {
-  skipUnlessMock()
-  await page.goto('/rennmaeuse/neu')
-  await page.getByRole('button', { name: t.button }).click()
-  await page.getByRole('button', { name: t.loadButton }).click()
-  await expect(page.getByRole('button', { name: 'Fenrir' })).toBeVisible()
-
-  // Klick auf Vorschlag 'Fenrir'
-  await page.getByRole('button', { name: 'Fenrir' }).click()
-
-  // Panel geschlossen, Name-Feld befüllt
-  await expect(page.getByText(t.panelTitle)).toBeHidden()
-  await expect(page.getByLabel(`${de.pages.gerbils.fields.name} *`)).toHaveValue('Fenrir')
-})
-
-test('Buchstabe-Filter schränkt Vorschläge ein (FEAT-NAMEGEN)', async ({ page }) => {
-  skipUnlessMock()
-  await page.goto('/rennmaeuse/neu')
-  await page.getByRole('button', { name: t.button }).click()
-  await page.getByLabel(t.letterLabel).fill('F')
-  await page.getByRole('button', { name: t.loadButton }).click()
-
-  // Mock gibt nur Namen mit F zurück: Fenrir + Freya
-  await expect(page.getByRole('button', { name: 'Fenrir' })).toBeVisible()
-  await expect(page.getByRole('button', { name: 'Freya' })).toBeVisible()
-  // Artemis (A) nicht sichtbar
-  await expect(page.getByRole('button', { name: 'Artemis' })).toBeHidden()
-})
-
-test('503 NamesKeyMissing zeigt freundlichen Hinweis (FEAT-NAMEGEN)', async ({ page, mockDb }) => {
-  skipUnlessMock()
-  if (mockDb) mockDb.namesConfigured = false
-  await page.goto('/rennmaeuse/neu')
-  await page.getByRole('button', { name: t.button }).click()
-  await page.getByRole('button', { name: t.loadButton }).click()
-  await expect(page.getByText(t.keyMissing)).toBeVisible()
-})

gerbil-manager-web/e2e/smoke-2.spec.ts

@@ -1,169 +0,0 @@
-/**
- * QA-SMOKE-2: Gezielter Live-Smoke der heute gemergten Änderungen (main e6b513e).
- * Läuft NUR im LIVE-Modus (E2E_BASE_URL gesetzt).
- *
- * Abgedeckte Änderungen:
- *  1. GEN-3h  — Bracket-Notation: eef→ee[f], cchm→c[chm], C/cchm→Cc[chm]
- *  2. FORM-FIELDS — originBreeder + isDeaf im Tier-Editformular
- *  3. CR-2    — Partial-Update nullt keine bestehenden Felder mehr
- *  4. UI-POLISH — '(ohne Namen)'-Platzhalter für namenlose Tiere
- *  5. GEHEGE   — Redirects + Nav (bereits in gehege-regression.spec; hier live-Verifikation)
- *
- * Read-Only soweit möglich. CR-2-Test: idempotentes Save (keine Wertänderung).
- */
-import { de, expect, skipUnlessLive, test } from './fixtures'
-
-const API = 'http://localhost:5179'
-
-// ── 1. GEN-3h Bracket-Notation ───────────────────────────────────────────────
-
-test('GEN-3h: eef zeigt ee[f] (nicht "eef") im Tier-Detail', async ({ page }) => {
-  skipUnlessLive()
-  // Roswitha — genotype: "aa CC D? eef Gg P? spsp ??"
-  // eef = e/ef het → E>e>ef Rank → ee[f]
-  await page.goto('/rennmaeuse/66ee246c-26f0-41ac-8b6c-c151d9287633')
-  await expect(page.getByRole('heading', { name: 'Roswitha von den Kleinen Chaoten' })).toBeVisible()
-  // Genotyp-Block soll e[f] enthalten, nicht rohes 'eef'
-  const genoCode = page.locator('code').filter({ hasText: /e\[f\]/ })
-  await expect(genoCode).toBeVisible({ timeout: 8_000 })
-  // Rohes 'eef' darf nicht mehr im Code-Block stehen
-  await expect(page.locator('code').filter({ hasText: /[^[]eef/ })).toBeHidden()
-})
-
-test('GEN-3h: cchm/cchm zeigt c[chm]c[chm] im Tier-Detail (ZoneFire)', async ({ page }) => {
-  skipUnlessLive()
-  // ZoneFire — genotype: "Aa cchmcchm D? Ee Gg P? Spsp ??"
-  await page.goto('/rennmaeuse/14d5cea9-0f87-4381-8afe-80f1d58f7b76')
-  await expect(page.getByRole('heading', { name: 'ZoneFire' })).toBeVisible()
-  const genoCode = page.locator('code').filter({ hasText: /c\[chm\]/ })
-  await expect(genoCode).toBeVisible({ timeout: 8_000 })
-  await expect(page.locator('code').filter({ hasText: /cchmcchm/ })).toBeHidden()
-})
-
-test('GEN-3h: Cc[chm] + ee[f] korrekt bei Ethan (gemischter Locus)', async ({ page }) => {
-  skipUnlessLive()
-  // Ethan — genotype: "Aa Ccchm D? eef Gg Pp Spsp ??"
-  // Ccchm → Cc[chm]; eef → ee[f]
-  await page.goto('/rennmaeuse/54ef9b08-0def-496e-95db-5107b732ddd4')
-  await expect(page.getByRole('heading', { name: 'Ethan von den Kleinen Chaoten' })).toBeVisible()
-  const genoCode = page.locator('code')
-  await expect(genoCode.filter({ hasText: /c\[chm\]/ })).toBeVisible({ timeout: 8_000 })
-  await expect(genoCode.filter({ hasText: /e\[f\]/ })).toBeVisible()
-  // Rohes Storage-Format darf nicht sichtbar sein
-  await expect(genoCode.filter({ hasText: /Ccchm|eef/ })).toBeHidden()
-})
-
-// ── 2. FORM-FIELDS: originBreeder + isDeaf im Formular ───────────────────────
-
-test('FORM-FIELDS: Herkunft-Freitext + Gehörlos-Dropdown im Tier-Editformular', async ({
-  page,
-}) => {
-  skipUnlessLive()
-  // Ethan hat bereits originBreeder="Kleinen Chaoten", isDeaf=null
-  await page.goto('/rennmaeuse/54ef9b08-0def-496e-95db-5107b732ddd4/bearbeiten')
-  await expect(page.getByRole('heading', { name: de.pages.gerbils.form.editTitle })).toBeVisible({ timeout: 8_000 })
-
-  // Herkunft-Freitext (originBreeder) soll sichtbar und gefüllt sein
-  const originInput = page.getByLabel(de.pages.gerbils.fields.originBreeder)
-  await expect(originInput).toBeVisible()
-  await expect(originInput).toHaveValue('Kleinen Chaoten')
-
-  // Gehörlos-Dropdown (isDeaf) soll sichtbar sein mit "Unbekannt"-Default
-  // Gehörlos-Dropdown (isDeaf): label 'Gehörlos', aktuell leer (Unbekannt)
-  const deafLabel = page.locator('label').filter({ hasText: de.pages.gerbils.fields.isDeaf })
-  await expect(deafLabel).toBeVisible()
-  // Dropdown-Select im Label-Kontext
-  const deafSelect = deafLabel.locator('select')
-  await expect(deafSelect).toBeVisible()
-})
-
-// ── 3. CR-2: idempotentes Save nullt keine Felder ────────────────────────────
-
-test('CR-2: Partial-PUT nullt keine bestehenden Felder (direkter API-Test)', async ({ page }) => {
-  skipUnlessLive()
-  // Snapshot VORHER
-  const before = await page.request.get(`${API}/gerbils/54ef9b08-0def-496e-95db-5107b732ddd4`)
-  const snap = await before.json()
-  expect(snap.originBreeder).toBe('Kleinen Chaoten')
-  expect(snap.genotype).toBeTruthy()
-
-  // Partial-PUT: nur name + gender senden (minimal body, alle anderen Felder fehlen)
-  // Mit PATCH-Semantik-Fix: fehlende Felder werden NICHT genullt
-  const res = await page.request.put(`${API}/gerbils/54ef9b08-0def-496e-95db-5107b732ddd4`, {
-    data: {
-      name: snap.name,
-      gender: snap.gender,
-      status: snap.status,
-      isResident: snap.isResident,
-      // ALLE anderen Felder absichtlich weggelassen → vor CR-2-Fix würden sie auf null gesetzt
-    },
-  })
-  // PATCH-Semantik: 204 No Content (kein Body), fehlende Felder bleiben erhalten
-  expect(res.status()).toBe(204)
-
-  // Re-Fetch und vergleichen
-  const afterRes = await page.request.get(`${API}/gerbils/54ef9b08-0def-496e-95db-5107b732ddd4`)
-  const updated = await afterRes.json()
-
-  expect(updated.originBreeder).toBe(snap.originBreeder)     // muss erhalten bleiben
-  expect(updated.genotype).toBe(snap.genotype)               // muss erhalten bleiben
-  expect(updated.dateOfBirth).toBe(snap.dateOfBirth)         // muss erhalten bleiben
-  expect(updated.litterId).toBe(snap.litterId)               // muss erhalten bleiben
-  expect(updated.externalRef).toBe(snap.externalRef)         // muss erhalten bleiben
-
-  // Restore: idempotent (gleiche Werte gesetzt, kein Net-Change)
-})
-
-// ── 4. UI-POLISH: '(ohne Namen)'-Platzhalter ─────────────────────────────────
-
-test('UI-POLISH: namenlose Tiere zeigen "(ohne Namen)" in der Tierliste', async ({ page }) => {
-  skipUnlessLive()
-  // Alle Tiere anzeigen (inkl. externe), um namenlose zu sehen
-  await page.goto('/rennmaeuse')
-  await expect(page.getByRole('heading', { name: de.pages.gerbils.title, exact: true })).toBeVisible()
-  // "(ohne Namen)" Platzhalter soll mindestens einmal sichtbar sein
-  // (Filter auf alle Tiere — ggf. "Externe anzeigen" aktivieren)
-  const placeholder = page.getByText('(ohne Namen)')
-  // Wenn nicht sofort sichtbar, Toggle "Externe anzeigen" probieren
-  if (!(await placeholder.isVisible({ timeout: 3_000 }).catch(() => false))) {
-    const toggle = page.locator('button, label').filter({ hasText: /extern|alle/i }).first()
-    if (await toggle.isVisible()) await toggle.click()
-  }
-  await expect(placeholder.first()).toBeVisible({ timeout: 8_000 })
-})
-
-test('UI-POLISH: namenloser Knoten im Stammbaum zeigt "(ohne Namen)"', async ({ page }) => {
-  skipUnlessLive()
-  // Stammbaum eines Tiers mit namenlosem Elternteil
-  // Tier "46c646a9" ist namenlos + resident; sein Elternteil im Stammbaum-Kontext
-  // Alternativ: Vance's Stammbaum enthält tiefe Äste, manche namenlos
-  await page.goto('/rennmaeuse/afdaff89-0274-4778-8f2f-3957a81bf58e/stammbaum')
-  await expect(page.locator('svg').first()).toBeVisible({ timeout: 12_000 })
-  // Prüfe ob "(ohne Namen)" irgendwo im Baum erscheint
-  const placeholder = page.getByText('(ohne Namen)')
-  // Kein harter Fail wenn kein namenloser Knoten sichtbar — Tree kann mit Lazy-Gen-5+ variieren
-  // Aber wenn vorhanden, muss der Text sauber sein (nicht leer)
-  const visible = await placeholder.isVisible({ timeout: 5_000 }).catch(() => false)
-  if (visible) {
-    await expect(placeholder.first()).toBeVisible()
-  }
-  // Kein JS-Error auf der Seite (implizit durch erfolgreiche Navigation)
-})
-
-// ── 5. GEHEGE: Live-Verifikation der Redirect/Nav-Änderungen ─────────────────
-
-test('GEHEGE live: /becken leitet auf /gehege weiter', async ({ page }) => {
-  skipUnlessLive()
-  await page.goto('/becken')
-  await expect(page).toHaveURL(/\/gehege$/, { timeout: 5_000 })
-  await expect(page.getByRole('heading', { name: de.pages.becken.title, exact: true })).toBeVisible()
-})
-
-test('GEHEGE live: "/" leitet auf /rennmaeuse weiter (kein Start-Screen)', async ({ page }) => {
-  skipUnlessLive()
-  await page.goto('/')
-  await expect(page).toHaveURL(/\/rennmaeuse$/, { timeout: 5_000 })
-  await expect(
-    page.getByRole('heading', { name: de.pages.gerbils.title, exact: true }),
-  ).toBeVisible()
-})

gerbil-manager-web/e2e/stammbaum.spec.ts

@@ -53,29 +53,3 @@ test('unbekanntes Tier zeigt den deutschen Nicht-gefunden-Zustand', async ({ pag
   await page.goto('/rennmaeuse/gibt-es-nicht/stammbaum')
   await expect(page.getByText(t.notFound).or(page.getByText(de.api.errors.notFound))).toBeVisible()
 })
-
-test('Ahnen-Namen sind Links zur Tier-Detailseite (STAMMBAUM-OPEN)', async ({ page }) => {
-  skipUnlessMock()
-  await page.goto('/rennmaeuse/kruemel/stammbaum')
-  await expect(page.locator('.pedigree-card').first()).toBeVisible()
-
-  // Fridolin ist Vater von Krümel — sein Name-Link soll /rennmaeuse/fridolin öffnen
-  const nameLink = page.getByRole('link', { name: 'Fridolin' })
-  await expect(nameLink).toBeVisible()
-  // href korrekt gesetzt
-  await expect(nameLink).toHaveAttribute('href', '/rennmaeuse/fridolin')
-  // Tastatur-Navigation (umgeht Toolbar-Überlappung im SVG-Canvas, testet zugl. Accessibility)
-  await nameLink.focus()
-  await page.keyboard.press('Enter')
-  await expect(page.getByRole('heading', { name: 'Fridolin' })).toBeVisible()
-  await expect(page).toHaveURL(/\/rennmaeuse\/fridolin$/)
-})
-
-test('Namenloser Ahne zeigt Platzhalter in der Stammbaum-Karte (UI-POLISH-2)', async ({ page }) => {
-  skipUnlessMock()
-  await page.goto('/rennmaeuse/nameless-stub/stammbaum')
-  // Titel zeigt '(ohne Namen)'
-  await expect(page.getByRole('heading', { name: t.titleFor(de.pages.gerbils.nameless) })).toBeVisible()
-  // Karte selbst zeigt '(ohne Namen)' statt leer
-  await expect(page.locator('.pedigree-card__nametext')).toHaveText(de.pages.gerbils.nameless)
-})

gerbil-manager-web/e2e/tiere.spec.ts

@@ -127,19 +127,6 @@ test('Detailseite: Herkunft zeigt Kontaktlink wenn originContactId gesetzt (WURF
   await expect(originLink).toHaveAttribute('href', '/kontakte/con-meier')
 })
 
-test('Namenlose Tiere zeigen Platzhalter in der Liste (UI-POLISH-1)', async ({ page }) => {
-  skipUnlessMock()
-  await page.goto('/rennmaeuse')
-  // 'nameless-stub' hat name='' → Platzhalter '(ohne Namen)' soll als Link sichtbar sein
-  await expect(page.getByRole('link', { name: de.pages.gerbils.nameless })).toBeVisible()
-})
-
-test('Namenlose Tiere zeigen Platzhalter im Detail-Header (UI-POLISH-1)', async ({ page }) => {
-  skipUnlessMock()
-  await page.goto('/rennmaeuse/nameless-stub')
-  await expect(page.getByRole('heading', { name: de.pages.gerbils.nameless })).toBeVisible()
-})
-
 test('Tier bearbeiten — Notizen ändern', async ({ page }) => {
   skipUnlessMock()
   await page.goto('/rennmaeuse/kruemel/bearbeiten')
@@ -149,50 +136,3 @@ test('Tier bearbeiten — Notizen ändern', async ({ page }) => {
   await expect(page.getByRole('heading', { name: 'Krümel' })).toBeVisible()
   await expect(page.getByText('Sehr zutraulich.')).toBeVisible()
 })
-
-test('Tier bearbeiten — originBreeder Freitext round-trip (FORM-FIELDS-1)', async ({ page }) => {
-  skipUnlessMock()
-  // Fridolin hat originBreeder='Zoohandlung Meier', kein originContactId → Freitext-Feld vorbelegt
-  await page.goto('/rennmaeuse/fridolin/bearbeiten')
-  await expect(page.getByLabel(t.fields.originBreeder)).toHaveValue('Zoohandlung Meier')
-  await page.getByLabel(t.fields.originBreeder).fill('Neue Musterzucht')
-  await page.getByRole('button', { name: t.form.save, exact: true }).click()
-  // Detailseite: Herkunft zeigt den neuen Wert (kein Contact → originBreeder-Text)
-  await expect(page.getByText('Neue Musterzucht')).toBeVisible()
-})
-
-test('Tier bearbeiten — isDeaf Tristate round-trip (FORM-FIELDS-1)', async ({ page }) => {
-  skipUnlessMock()
-  await page.goto('/rennmaeuse/kruemel/bearbeiten')
-  // Standard: Unbekannt (null → value='')
-  await expect(page.getByLabel(t.fields.isDeaf)).toHaveValue('')
-  await page.getByLabel(t.fields.isDeaf).selectOption({ label: t.form.isDeafYes })
-  await page.getByRole('button', { name: t.form.save, exact: true }).click()
-  // Zurück zur Bearbeiten-Seite: Wert muss erhalten sein
-  await page.goto('/rennmaeuse/kruemel/bearbeiten')
-  await expect(page.getByLabel(t.fields.isDeaf)).toHaveValue('true')
-})
-
-test('Detailseite: Würfe als Elternteil zeigt verlinkten Wurf (ANIMAL-LITTERS)', async ({ page }) => {
-  skipUnlessMock()
-  // Fridolin ist fatherId von 'w-kruemel' (Wurf K)
-  await page.goto('/rennmaeuse/fridolin')
-  await expect(page.getByRole('heading', { name: 'Fridolin' })).toBeVisible()
-  await expect(page.getByText(t.detail.parentLittersTitle)).toBeVisible()
-  // Wurf K als Link sichtbar
-  const litterLink = page.getByRole('link', { name: /Wurf K/ })
-  await expect(litterLink).toBeVisible()
-  // Vater-Badge sichtbar
-  await expect(page.getByText(t.detail.parentLittersRoleVater)).toBeVisible()
-  // Navigation zum Wurf funktioniert
-  await litterLink.first().click()
-  await expect(page.getByRole('heading', { name: 'Wurf K' })).toBeVisible()
-})
-
-test('Detailseite: Keine Würfe als Elternteil zeigt Leer-Zustand (ANIMAL-LITTERS)', async ({ page }) => {
-  skipUnlessMock()
-  // Krümel hat keine Würfe als Elternteil (nur als Kind von w-kruemel)
-  await page.goto('/rennmaeuse/kruemel')
-  await expect(page.getByText(t.detail.parentLittersTitle)).toBeVisible()
-  await expect(page.getByText(t.detail.parentLittersEmpty)).toBeVisible()
-})

gerbil-manager-web/src/api/__tests__/names.test.ts

@@ -1,73 +0,0 @@
-/** FEAT-NAMEGEN: Tests für buildSuggestPath + NAMEGEN_USAGES. */
-import { describe, expect, it } from 'vitest'
-import { buildSuggestPath, NAMEGEN_USAGES } from '../names'
-
-describe('buildSuggestPath', () => {
-  it('includes uppercased letter', () => {
-    const path = buildSuggestPath({ letter: 'f', gender: 'female', usages: ['norn'] })
-    expect(path).toContain('letter=F')
-  })
-
-  it('omits letter when blank', () => {
-    const path = buildSuggestPath({ letter: '', usages: ['norn'] })
-    expect(path).not.toContain('letter=')
-  })
-
-  it('omits letter when only whitespace', () => {
-    const path = buildSuggestPath({ letter: '  ', usages: ['norn'] })
-    expect(path).not.toContain('letter=')
-  })
-
-  it('includes gender', () => {
-    const path = buildSuggestPath({ gender: 'male', usages: ['norn'] })
-    expect(path).toContain('gender=male')
-  })
-
-  it('omits gender for empty string', () => {
-    const path = buildSuggestPath({ gender: '', usages: ['norn'] })
-    expect(path).not.toContain('gender=')
-  })
-
-  it('joins multiple usages without encoding commas', () => {
-    const path = buildSuggestPath({ usages: ['norn', 'mythg'] })
-    expect(path).toContain('usages=norn,mythg')
-  })
-
-  it('omits usages when array is empty', () => {
-    const path = buildSuggestPath({ usages: [] })
-    expect(path).not.toContain('usages=')
-  })
-
-  it('defaults count to 6', () => {
-    const path = buildSuggestPath({ usages: ['norn'] })
-    expect(path).toContain('count=6')
-  })
-
-  it('uses provided count', () => {
-    const path = buildSuggestPath({ usages: ['norn'], count: 8 })
-    expect(path).toContain('count=8')
-  })
-
-  it('starts with /names/suggest', () => {
-    const path = buildSuggestPath({ usages: ['norn'] })
-    expect(path).toMatch(/^\/names\/suggest\?/)
-  })
-})
-
-describe('NAMEGEN_USAGES', () => {
-  it('contains all 5 expected culture codes', () => {
-    const codes = NAMEGEN_USAGES.map((u) => u.code)
-    expect(codes).toContain('norn')
-    expect(codes).toContain('japa')
-    expect(codes).toContain('mythg')
-    expect(codes).toContain('ger')
-    expect(codes).toContain('arb')
-    expect(codes).toHaveLength(5)
-  })
-
-  it('every usage has a non-empty label', () => {
-    for (const u of NAMEGEN_USAGES) {
-      expect(u.label.length).toBeGreaterThan(0)
-    }
-  })
-})

gerbil-manager-web/src/api/names.ts

@@ -1,40 +0,0 @@
-/** FEAT-NAMEGEN: Namensvorschläge — Schnittstelle zum Backend /names/suggest. */
-import { api } from './client'
-
-export interface NameSuggestion {
-  name: string
-  meaning: string
-  origin: string
-}
-
-export const NAMEGEN_USAGES = [
-  { code: 'norn', label: 'Nordisch' },
-  { code: 'japa', label: 'Japanisch' },
-  { code: 'mythg', label: 'Griech. Mythologie' },
-  { code: 'ger', label: 'Deutsch' },
-  { code: 'arb', label: 'Arabisch' },
-] as const
-
-export type NamegenUsageCode = (typeof NAMEGEN_USAGES)[number]['code']
-
-export interface SuggestNamesParams {
-  letter?: string
-  gender?: string
-  usages: NamegenUsageCode[]
-  count?: number
-}
-
-/** Exported for unit tests — builds the query path without a network call. */
-export function buildSuggestPath(params: SuggestNamesParams): string {
-  const parts: string[] = []
-  const letter = params.letter?.trim().toUpperCase()
-  if (letter) parts.push(`letter=${encodeURIComponent(letter)}`)
-  if (params.gender && params.gender !== '') parts.push(`gender=${encodeURIComponent(params.gender)}`)
-  if (params.usages.length > 0) parts.push(`usages=${params.usages.join(',')}`)
-  parts.push(`count=${params.count ?? 6}`)
-  return `/names/suggest?${parts.join('&')}`
-}
-
-export function suggestNames(params: SuggestNamesParams): Promise<NameSuggestion[]> {
-  return api.get<NameSuggestion[]>(buildSuggestPath(params))
-}

gerbil-manager-web/src/api/types.ts

@@ -54,8 +54,6 @@ export interface Gerbil {
    * as resident (backend default true).
    */
   isResident?: boolean
-  /** FORM-FIELDS-1: true=gehörlos, false=hörend, null=unbekannt. */
-  isDeaf?: boolean | null
 }
 
 /** Payload for POST /gerbils. */
@@ -78,7 +76,6 @@ export interface CreateGerbil {
   characterTraits?: string[] | null
   characterNote?: string | null
   isResident?: boolean
-  isDeaf?: boolean | null
 }
 
 /** Payload for PUT /gerbils/{id} (all optional / partial update). */

gerbil-manager-web/src/components/AnimalPicker.tsx

@@ -1,7 +1,5 @@
 import { useState } from 'react'
 import { de } from '../strings/de'
-
-const nameless = de.pages.gerbils.nameless
 import { listGerbils } from '../api/gerbils'
 import { andFilter, condition } from '../api/gridify'
 import type { Gender, Gerbil, Paged } from '../api/types'
@@ -64,7 +62,7 @@ export default function AnimalPicker({ gender, onPick }: AnimalPickerProps) {
                   setOpen(false)
                 }}
               >
-                {g.name || nameless}
+                {g.name}
               </button>
             </li>
           ))}

gerbil-manager-web/src/components/BreedingResultView.tsx

@@ -43,29 +43,16 @@ export default function BreedingResultView({ result, title }: BreedingResultView
       ) : (
         <>
           <ul className="farbschlag-cards">
-            {result.byFarbschlag.map((f) => {
-              // Representative genotype: highest-prob offspring for this farbschlag.
-              const repGenotype = result.offspring.find(
-                (o) => o.farbschlag === f.farbschlag,
-              )?.genotype
-              return (
-                <li key={f.farbschlag} className="farbschlag-card">
-                  <div className="farbschlag-card__img">
-                    <FarbschlagImage name={f.farbschlag} />
-                  </div>
-                  <div className="farbschlag-card__body">
-                    <span className="farbschlag-card__name">{f.farbschlag}</span>
-                    {repGenotype && (
-                      <code className="farbschlag-card__geno">{repGenotype}</code>
-                    )}
-                  </div>
-                  <span className="farbschlag-card__prob">
-                    {f.probability.percent}
-                    <small> ({f.probability.text})</small>
-                  </span>
-                </li>
-              )
-            })}
+            {result.byFarbschlag.map((f) => (
+              <li key={f.farbschlag} className="farbschlag-card">
+                <FarbschlagImage name={f.farbschlag} />
+                <span className="farbschlag-card__name">{f.farbschlag}</span>
+                <span className="farbschlag-card__prob">
+                  {f.probability.percent}
+                  <small> ({f.probability.text})</small>
+                </span>
+              </li>
+            ))}
           </ul>
 
           <button

gerbil-manager-web/src/components/NameSuggestPanel.css

@@ -1,114 +0,0 @@
-.namegen-name-row {
-  display: flex;
-  gap: 0.5rem;
-  align-items: center;
-}
-
-.namegen-name-row .input {
-  flex: 1;
-  min-width: 0;
-}
-
-.namegen-panel {
-  border: 1px solid var(--color-border);
-  border-radius: 0.5rem;
-  padding: 1rem;
-  margin-bottom: 1rem;
-  background: var(--color-bg, #fff);
-}
-
-.namegen-panel__header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 0.75rem;
-  font-weight: 600;
-}
-
-.namegen-panel__filters {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 1rem;
-  align-items: flex-start;
-  margin-bottom: 0.75rem;
-}
-
-.namegen-panel__letter {
-  display: flex;
-  flex-direction: column;
-  gap: 0.25rem;
-}
-
-.namegen-panel__letter-input {
-  width: 5rem;
-}
-
-.namegen-panel__usages {
-  display: flex;
-  flex-direction: column;
-  gap: 0.25rem;
-}
-
-.namegen-usages-grid {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 0.4rem 1rem;
-}
-
-.namegen-usages-grid label {
-  display: flex;
-  align-items: center;
-  gap: 0.3rem;
-  font-size: 0.9rem;
-  cursor: pointer;
-}
-
-.namegen-suggestions {
-  list-style: none;
-  margin: 0.75rem 0 0;
-  padding: 0;
-  border-top: 1px solid var(--color-border);
-}
-
-.namegen-suggestion {
-  display: flex;
-  align-items: baseline;
-  gap: 0.5rem;
-  padding: 0.5rem 0;
-  border-bottom: 1px solid var(--color-border);
-  flex-wrap: wrap;
-}
-
-.namegen-suggestion:last-child {
-  border-bottom: none;
-}
-
-.namegen-suggestion__pick {
-  font-weight: 600;
-  color: var(--color-accent, #2563eb);
-  background: none;
-  border: none;
-  padding: 0;
-  cursor: pointer;
-  text-align: left;
-  font-size: inherit;
-  font-family: inherit;
-  min-width: 6rem;
-}
-
-.namegen-suggestion__pick:hover {
-  text-decoration: underline;
-}
-
-.namegen-suggestion__meaning {
-  flex: 1;
-  font-size: 0.88rem;
-  color: var(--color-text-muted);
-  min-width: 8rem;
-}
-
-.namegen-suggestion__origin {
-  font-size: 0.85rem;
-  color: var(--color-text-muted);
-  white-space: nowrap;
-}

gerbil-manager-web/src/components/NameSuggestPanel.tsx

@@ -1,132 +0,0 @@
-import { useState } from 'react'
-import { de } from '../strings/de'
-import { ApiError, errorCode } from '../api/client'
-import { NAMEGEN_USAGES, suggestNames, type NamegenUsageCode, type NameSuggestion } from '../api/names'
-import './NameSuggestPanel.css'
-
-interface NameSuggestPanelProps {
-  gender: string
-  onPick: (name: string) => void
-  onClose: () => void
-}
-
-const ALL_CODES = NAMEGEN_USAGES.map((u) => u.code) as NamegenUsageCode[]
-
-export default function NameSuggestPanel({ gender, onPick, onClose }: NameSuggestPanelProps) {
-  const t = de.namegen
-  const [letter, setLetter] = useState('')
-  const [usages, setUsages] = useState<Set<NamegenUsageCode>>(new Set(ALL_CODES))
-  const [loading, setLoading] = useState(false)
-  const [keyMissing, setKeyMissing] = useState(false)
-  const [error, setError] = useState<string | null>(null)
-  const [suggestions, setSuggestions] = useState<NameSuggestion[]>([])
-  const [fetched, setFetched] = useState(false)
-
-  function toggleUsage(code: NamegenUsageCode) {
-    setUsages((prev) => {
-      const next = new Set(prev)
-      if (next.has(code)) next.delete(code)
-      else next.add(code)
-      return next
-    })
-  }
-
-  async function load() {
-    setLoading(true)
-    setError(null)
-    setKeyMissing(false)
-    setSuggestions([])
-    try {
-      const result = await suggestNames({
-        letter: letter.trim() || undefined,
-        gender: gender || undefined,
-        usages: [...usages] as NamegenUsageCode[],
-        count: 6,
-      })
-      setSuggestions(result)
-      setFetched(true)
-    } catch (err) {
-      if (errorCode(err) === 'NamesKeyMissing') {
-        setKeyMissing(true)
-      } else {
-        setError(err instanceof ApiError ? err.message : de.api.errors.unknown)
-      }
-    } finally {
-      setLoading(false)
-    }
-  }
-
-  return (
-    <div className="namegen-panel" role="region" aria-label={t.panelTitle}>
-      <div className="namegen-panel__header">
-        <span>{t.panelTitle}</span>
-        <button type="button" className="btn" onClick={onClose} aria-label={t.close}>
-          ✕
-        </button>
-      </div>
-
-      <div className="namegen-panel__filters">
-        <div className="namegen-panel__letter">
-          <label htmlFor="namegen-letter">{t.letterLabel}</label>
-          <input
-            id="namegen-letter"
-            className="input namegen-panel__letter-input"
-            value={letter}
-            onChange={(e) => setLetter(e.target.value)}
-            placeholder={t.letterPlaceholder}
-            maxLength={1}
-          />
-        </div>
-
-        <div className="namegen-panel__usages">
-          <span>{t.usagesLabel}</span>
-          <div className="namegen-usages-grid">
-            {NAMEGEN_USAGES.map(({ code, label }) => (
-              <label key={code}>
-                <input
-                  type="checkbox"
-                  checked={usages.has(code)}
-                  onChange={() => toggleUsage(code)}
-                />
-                {label}
-              </label>
-            ))}
-          </div>
-        </div>
-      </div>
-
-      <button
-        type="button"
-        className="btn btn--primary"
-        onClick={load}
-        disabled={loading || usages.size === 0}
-      >
-        {loading ? t.loading : t.loadButton}
-      </button>
-
-      {keyMissing && <p className="muted">{t.keyMissing}</p>}
-      {error && <p className="error-text">{error}</p>}
-      {fetched && !loading && !keyMissing && !error && suggestions.length === 0 && (
-        <p className="muted">{t.empty}</p>
-      )}
-
-      {suggestions.length > 0 && (
-        <ul className="namegen-suggestions" aria-label={t.panelTitle}>
-          {suggestions.map((s, i) => (
-            <li key={`${s.name}-${i}`} className="namegen-suggestion">
-              <button
-                type="button"
-                className="namegen-suggestion__pick"
-                onClick={() => onPick(s.name)}
-              >
-                {s.name}
-              </button>
-              <span className="namegen-suggestion__meaning">{s.meaning}</span>
-              <span className="namegen-suggestion__origin">{s.origin}</span>
-            </li>
-          ))}
-        </ul>
-      )}
-    </div>
-  )
-}

gerbil-manager-web/src/genetics/__tests__/genetics.test.ts

@@ -179,21 +179,17 @@ describe('Farbschlag catalog', () => {
     expect(match.name).toBe('Unbekannter Farbschlag')
   })
 
-  it('has the expected catalogue coverage (GEN-4: 70 after adding 4 dilute-fox entries)', () => {
-    // GEN-3f: 73 -> 61. GEN-3g: +5 -> 66. GEN-4: +4 (Dilute Algierfuchs/Goldfuchs/Rotfuchs/Polarfuchs) -> 70.
-    expect(CATALOG_SIZE).toBe(70)
+  it('has the expected catalogue coverage (GEN-3g: 66 after adding CP-*-Hell het variants)', () => {
+    // GEN-3f: 73 -> 61 (cchm CP reconciliation).
+    // GEN-3g: +5 het variants (CP-Agouti/Silberagouti/Algierfuchs/Polarfuchs/Orangeschimmel -Hell),
+    // giving 61 + 5 = 66. CP-Fuchs-Hell was already counted.
+    expect(CATALOG_SIZE).toBe(66)
   })
 
   it('frozen contract names round-trip to themselves (DB-key guard)', () => {
     // The first 18 are the frozen ColorVariety keys — their representative
     // genotype MUST resolve back to their own name, never a later variety.
-    // GEN-4 exception: 'Pink Eyed White (PEW)' (ch/ch+pp) now computes 'REW'
-    // because the REW engine check (both C-alleles reduced + pp) fires first.
-    // PEW stays in the catalog as a user-pickable import name; its computed
-    // farbschlag is intentionally 'REW' per Julian's extended rule.
-    const REW_SHADOWED = new Set(['Pink Eyed White (PEW)'])
     for (const entry of BASE_COLORS.slice(0, FROZEN_COUNT)) {
-      if (REW_SHADOWED.has(entry.name)) continue
       expect(genotypeToFarbschlag(representativeGenotype(entry))).toBe(entry.name)
     }
   })
@@ -377,11 +373,9 @@ describe("GEN-3c: unknown allele displays as '-' (stored as '?')", () => {
 })
 
 describe('GEN-3c: no Unbekannt when the E locus is known (family fallback)', () => {
-  it('eef with unknown other loci -> specific Schimmel variety (GEN-4: Fuchsschimmel is a category)', () => {
-    // GEN-4: locusToken ef/e -> 'ef' enables catalog match; family fallback 'Fuchsschimmel' blocked.
-    // aa + ef/e + C/D/G/P resolved via GEN-3d -> Kohlfuchsschimmel (A:a, C:C, D:D, E:ef, G:G, P:P).
+  it('eef with unknown other loci -> Fuchsschimmel (the reported bug case)', () => {
     expect(genotypeToFarbschlag(fromDisplayString('aa C- D- eef Gg Pp spsp --'))).toBe(
-      'Kohlfuchsschimmel',
+      'Fuchsschimmel',
     )
   })
   it('ee -> Fuchs family, efef -> a Schimmel (never Unbekannt) even with unknowns', () => {
@@ -407,11 +401,9 @@ describe('GEN-3d: dominance tiebreak for unknown loci', () => {
     expect(genotypeToFarbschlag(fromDisplayString('AA CC DD EE GG PP sp- rere'))).toBe('Agouti')
   })
 
-  it('still: eef with unknowns -> specific variety, not category (GEN-4 update)', () => {
-    // GEN-4: 'Fuchsschimmel' is a Farbart/category; the engine now resolves to the
-    // specific catalog entry (Kohlfuchsschimmel) via the locusToken ef/e -> 'ef' fix.
+  it('still: eef with unknowns -> Fuchsschimmel (family pin unaffected by tiebreak)', () => {
     expect(genotypeToFarbschlag(fromDisplayString('aa C- D- eef Gg Pp spsp --'))).toBe(
-      'Kohlfuchsschimmel',
+      'Fuchsschimmel',
     )
   })
 })
@@ -429,8 +421,7 @@ describe('GEN-3e: C-locus colourpoint naming', () => {
     expect(name('AA cchmch DD EE gg PP spsp rere')).toBe('CP-Silberagouti-Hell')
     expect(name('AA cchmch DD ee GG PP spsp rere')).toBe('CP-Algierfuchs-Hell')
     expect(name('AA cchmch DD ee gg PP spsp rere')).toBe('CP-Polarfuchs-Hell')
-    // GEN-4: dd base = 'Dilute Algierfuchs' → 'Dilute CP-Algierfuchs-Hell'
-    expect(name('AA cchmch dd ee GG PP spsp rere')).toBe('Dilute CP-Algierfuchs-Hell')
+    expect(name('AA cchmch dd ee GG PP spsp rere')).toBe('CP-Fuchs-Hell')
   })
 
   it('aa fixed colourpoint names (Marder/Siam/Zobel/Zobel-Hell)', () => {
@@ -480,8 +471,8 @@ describe('GEN-3f: CP catalog reconciled to the breeder CP- naming (matches her l
     expect(name('AA cchmcchm DD EE gg PP spsp rere')).toBe('CP-Silberagouti')
     expect(name('AA cchmcchm DD ee GG PP spsp rere')).toBe('CP-Algierfuchs')
     expect(name('AA cchmcchm DD ee gg PP spsp rere')).toBe('CP-Polarfuchs')
-    // GEN-4: dd+ee base = 'Dilute Algierfuchs' -> 'Dilute CP-Algierfuchs' (no more CP-Fuchs catch-all).
-    expect(name('AA cchmcchm dd ee GG PP spsp rere')).toBe('Dilute CP-Algierfuchs')
+    // dd agouti fox has no dedicated base -> the eFamily fallback yields 'CP-Fuchs'.
+    expect(name('AA cchmcchm dd ee GG PP spsp rere')).toBe('CP-Fuchs')
     // A- cchm efef -> CP-Orangeschimmel (Schimmel base under full C).
     expect(name('AA cchmcchm DD efef GG PP spsp rere')).toBe('CP-Orangeschimmel')
   })
@@ -490,12 +481,11 @@ describe('GEN-3f: CP catalog reconciled to the breeder CP- naming (matches her l
     const siam = BASE_COLORS.find((e) => e.name === 'Siam')!
     const zh = BASE_COLORS.find((e) => e.name === 'Zobel-Hell')!
     const cpah = BASE_COLORS.find((e) => e.name === 'CP-Agouti-Hell')!
-    // GEN-4: CP-Fuchs-Hell kept for import/hand-pick but engine now returns the specific name.
     const cpfh = BASE_COLORS.find((e) => e.name === 'CP-Fuchs-Hell')!
     expect(genotypeToFarbschlag(representativeGenotype(siam))).toBe('Siam')
     expect(genotypeToFarbschlag(representativeGenotype(zh))).toBe('Zobel-Hell')
     expect(genotypeToFarbschlag(representativeGenotype(cpah))).toBe('CP-Agouti-Hell')
-    expect(genotypeToFarbschlag(representativeGenotype(cpfh))).toBe('Dilute CP-Algierfuchs-Hell')
+    expect(genotypeToFarbschlag(representativeGenotype(cpfh))).toBe('CP-Fuchs-Hell')
   })
 })
 
@@ -517,8 +507,7 @@ describe('GEN-3g: "-Hell" in variety name == cchm/ch het; hom == cchm/cchm', ()
     expect(name('AA cchmch DD EE gg PP spsp rere')).toBe('CP-Silberagouti-Hell')
     expect(name('AA cchmch DD ee GG PP spsp rere')).toBe('CP-Algierfuchs-Hell')
     expect(name('AA cchmch DD ee gg PP spsp rere')).toBe('CP-Polarfuchs-Hell')
-    // GEN-4: dd+ee base = 'Dilute Algierfuchs' → prefix ordering: 'Dilute CP-Algierfuchs-Hell'
-    expect(name('AA cchmch dd ee GG PP spsp rere')).toBe('Dilute CP-Algierfuchs-Hell')
+    expect(name('AA cchmch dd ee GG PP spsp rere')).toBe('CP-Fuchs-Hell')
     expect(name('AA cchmch DD efef GG PP spsp rere')).toBe('CP-Orangeschimmel-Hell')
   })
 
@@ -536,58 +525,6 @@ describe('GEN-3g: "-Hell" in variety name == cchm/ch het; hom == cchm/cchm', ()
   })
 })
 
-describe('GEN-4: Dilute prefix, REW, no-bare-Fuchs', () => {
-  const name = (s: string) => genotypeToFarbschlag(fromDisplayString(s))
-
-  it('dd entries use Dilute prefix — no more X-dd names', () => {
-    expect(name('AA CC dd EE GG PP spsp rere')).toBe('Dilute Agouti')
-    expect(name('aa CC dd EE gg PP spsp rere')).toBe('Dilute Anthrazit')
-    expect(name('aa CC dd ee GG PP spsp rere')).toBe('Dilute Kohlfuchs')
-    expect(name('aa CC dd ee gg pp spsp rere')).toBe('Dilute Blaufuchs')
-    expect(name('AA CC dd EE GG pp spsp rere')).toBe('Dilute Gold')
-    expect(name('aa CC dd EE GG pp spsp rere')).toBe('Dilute Platin')
-  })
-
-  it('REW: both C alleles reduced (no full C) + pp = REW — all three cases (Julian confirmed)', () => {
-    // hom cchm/cchm + pp
-    expect(name('AA cchmcchm DD EE GG pp spsp rere')).toBe('REW')  // CP-Gold
-    expect(name('AA cchmcchm DD ee GG pp spsp rere')).toBe('REW')  // CP-Goldfuchs
-    expect(name('AA cchmcchm DD EE gg pp spsp rere')).toBe('REW')  // CP-Elfenbein
-    expect(name('AA cchmcchm DD ee gg pp spsp rere')).toBe('REW')  // CP-Apricot
-    expect(name('AA cchmcchm dd EE GG pp spsp rere')).toBe('REW')  // CP-dd Gold
-    // het cchm/ch + pp (Julian: also REW)
-    expect(name('AA cchmch DD EE GG pp spsp rere')).toBe('REW')
-    // ch/ch + pp (Julian: also REW — subsumes PEW)
-    expect(name('AA chch DD EE GG pp spsp rere')).toBe('REW')
-    expect(name('aa chch DD EE GG pp spsp rere')).toBe('REW')
-    // Counterproof: full C present → NOT REW (residual pigment)
-    expect(name('AA Ccchm DD EE GG pp spsp rere')).not.toBe('REW') // Cc[chm] + pp = Gold-like
-    expect(name('AA Cch DD EE GG pp spsp rere')).not.toBe('REW')   // Cc[h] + pp
-  })
-
-  it('Farbarten (categories) never appear as computed results', () => {
-    // 'Fuchs', 'Fuchsschimmel', 'Schimmel' etc. are Farbarten — blocked by category guard.
-    // het ef/e now resolves to specific variety via locusToken ef/e -> 'ef' fix.
-    expect(genotypeToFarbschlag(fromDisplayString('aa CC DD eef GG PP spsp rere'))).toBe('Kohlfuchsschimmel')
-    // Agouti ef/e: 'Orangeschimmel' wins (same token-set as Algierfuchsschimmel, listed first)
-    expect(genotypeToFarbschlag(fromDisplayString('AA CC DD eef GG PP spsp rere'))).toBe('Orangeschimmel')
-    // Unusual combo not in catalog -> Unbekannt (not 'Fuchsschimmel')
-    expect(farbschlagFor(fromDisplayString('aa CC dd eef GG PP spsp rere')).unknown).toBe(true)
-    // FK check: none of the 7 category names are in BASE_COLORS (no DB entries -> no FK risk)
-    const CATS = ['Standard', 'Colourpoint', 'Dilute', 'Fuchs', 'Fuchsschimmel', 'Schimmel', 'Colourpoint Dilute']
-    for (const cat of CATS) {
-      expect(BASE_COLORS.some(e => e.name === cat)).toBe(false)
-    }
-  })
-
-  it('bare Fuchs never appears — dilute-fox combinations are named specifically', () => {
-    expect(name('AA CC dd ee GG PP spsp rere')).toBe('Dilute Algierfuchs')
-    expect(name('AA CC dd ee GG pp spsp rere')).toBe('Dilute Goldfuchs')
-    expect(name('aa CC dd ee GG pp spsp rere')).toBe('Dilute Rotfuchs')
-    expect(name('AA CC dd ee gg PP spsp rere')).toBe('Dilute Polarfuchs')
-  })
-})
-
 describe('GEN-3h: breeder bracket-notation display + E-locus e-before-ef order', () => {
   // ── Display symbols ────────────────────────────────────────────────────
   it('ef displays as e[f], cchm as c[chm], ch as c[h]', () => {
@@ -665,21 +602,12 @@ describe('GEN-3h: breeder bracket-notation display + E-locus e-before-ef order',
     )
   })
 
-  it('e[-] standalone: parses as [e,?], displays e-', () => {
+  it('[-] bracket-unknown parses as wildcard (e[-] → E=[e,?], displays e-)', () => {
+    // NOTE: oracle for Silvain shows "ee[-]" which contains 3 E-allele tokens
+    // (e + e + [-]) and cannot be parsed. Flagged to god — see done-report.
+    // This test documents what [e,?] at E produces: "e-".
     const g = fromDisplayString('aa CC DD e[-] GG PP spsp rere')
     expect(g.E).toEqual(['e', '?'])
     expect(toDisplayString(g)).toBe('aa CC DD e- GG PP spsp rere')
   })
-
-  it('CR-1a: Silvain oracle ee[-] parses without crash → [e,?], displays e-', () => {
-    // Real herdbook notation: ee[-] = fox allele e + unknown e-type second allele.
-    // The lookbehind rule strips the second e[-] → '?', leaving 'e?' for splitToken.
-    const input = 'aa c[chm]c[chm] Dd ee[-] Gg Pp Spsp'
-    const g = fromDisplayString(input)
-    expect(g.E).toEqual(['e', '?'])
-    expect(g.C).toEqual(['cchm', 'cchm'])
-    expect(g.D).toEqual(['D', 'd'])
-    expect(g.Sp).toEqual(['Sp', 'sp'])
-    expect(toDisplayString(g)).toBe('aa c[chm]c[chm] Dd e- Gg Pp Spsp rere')
-  })
 })

gerbil-manager-web/src/genetics/catalog.ts

@@ -66,8 +66,8 @@ export const BASE_COLORS: readonly FarbschlagEntry[] = [
   { name: 'Platin', english: 'Lilac', tokens: { A: 'a', C: 'C', D: 'D', E: 'E', G: 'G', P: 'p' }, image: 'platin.JPG' },
   { name: 'Goldfuchs', english: 'Yellow Fox', tokens: { A: 'A', C: 'C', D: 'D', E: 'e', G: 'G', P: 'p' }, image: 'goldfuchs.jpg' },
   { name: 'Rotfuchs', english: 'Argente Nutmeg', tokens: { A: 'a', C: 'C', D: 'D', E: 'e', G: 'G', P: 'p' }, image: 'rotfuchs.JPG' },
-  { name: 'Dilute Gold', english: 'dd Argente Golden', tokens: { A: 'A', C: 'C', D: 'd', E: 'E', G: 'G', P: 'p' }, image: 'gold-dd.jpg' },
-  { name: 'Dilute Platin', english: 'dd Lilac', tokens: { A: 'a', C: 'C', D: 'd', E: 'E', G: 'G', P: 'p' }, image: 'platin-dd.jpg' },
+  { name: 'dd Gold', english: 'dd Argente Golden', tokens: { A: 'A', C: 'C', D: 'd', E: 'E', G: 'G', P: 'p' }, image: 'gold-dd.jpg' },
+  { name: 'dd Platin', english: 'dd Lilac', tokens: { A: 'a', C: 'C', D: 'd', E: 'E', G: 'G', P: 'p' }, image: 'platin-dd.jpg' },
 
   // ── baseportal.de varieties (GEN-2), normalized to the frozen allele table ──
   { name: 'Altweiss (REW)', tokens: { A: 'a', C: 'C', D: 'D', E: 'E', G: 'g', P: 'p' }, image: 'altweiss-rew.jpeg' },
@@ -78,24 +78,16 @@ export const BASE_COLORS: readonly FarbschlagEntry[] = [
   { name: 'Kohlfuchs', tokens: { A: 'a', C: 'C', D: 'D', E: 'e', G: 'G', P: 'P' }, image: 'kohlfuchs.jpg' },
   { name: 'Polarfuchs', tokens: { A: 'A', C: 'C', D: 'D', E: 'e', G: 'g', P: 'P' }, image: 'polarfuchs.jpg' },
   { name: 'Saphir', tokens: { A: 'a', C: 'C', D: 'D', E: 'E', G: 'G', P: 'p' }, image: 'saphir.jpg' },
-  // GEN-3a: efef base (agouti, wild C/D/G/P) = Orangeschimmel (breeder C5).
-  // GEN-4: A:'A' added — non-agouti ef animals fall through to Kohlfuchsschimmel etc.
-  { name: 'Orangeschimmel', tokens: { A: 'A', C: 'C', D: 'D', E: 'ef', G: 'G', P: 'P' }, image: 'schimmel-orangeschimmel.jpg' },
+  // GEN-3a: efef base (otherwise wild C/D/G/P) = Orangeschimmel (breeder C5).
+  { name: 'Orangeschimmel', tokens: { C: 'C', D: 'D', E: 'ef', G: 'G', P: 'P' }, image: 'schimmel-orangeschimmel.jpg' },
   { name: 'Topas', tokens: { A: 'A', C: 'C', D: 'D', E: 'E', G: 'G', P: 'p' }, image: 'topas.jpg' },
   { name: 'Platin-Hell', tokens: { A: 'a', C: 'C', D: 'D', E: 'E', G: 'G', P: 'p' }, image: 'platin-hell.jpg' },
-  { name: 'Dilute Agouti', tokens: { A: 'A', C: 'C', D: 'd', E: 'E', G: 'G', P: 'P' }, image: 'agouti-dd.jpg' },
-  { name: 'Dilute Silberagouti', tokens: { A: 'A', C: 'C', D: 'd', E: 'E', G: 'g', P: 'P' }, image: 'silberagouti-dd.jpg' },
-  { name: 'Dilute Kohlfuchs', tokens: { A: 'a', C: 'C', D: 'd', E: 'e', G: 'G', P: 'P' }, image: 'kohlfuchs-dd.jpg' },
-  { name: 'Dilute Anthrazit', tokens: { A: 'a', C: 'C', D: 'd', E: 'E', G: 'g', P: 'P' }, image: 'anthrazit-dd.jpg' },
-  // GEN-4: dilute fox base entries — prevent bare 'Fuchs' family fallback for
-  // agouti+dilute+fox combinations not otherwise covered in the catalog.
-  { name: 'Dilute Algierfuchs', tokens: { A: 'A', C: 'C', D: 'd', E: 'e', G: 'G', P: 'P' } },
-  { name: 'Dilute Goldfuchs', tokens: { A: 'A', C: 'C', D: 'd', E: 'e', G: 'G', P: 'p' } },
-  { name: 'Dilute Rotfuchs', tokens: { A: 'a', C: 'C', D: 'd', E: 'e', G: 'G', P: 'p' } },
-  { name: 'Dilute Polarfuchs', tokens: { A: 'A', C: 'C', D: 'd', E: 'e', G: 'g', P: 'P' } },
+  { name: 'Agouti dd', tokens: { A: 'A', C: 'C', D: 'd', E: 'E', G: 'G', P: 'P' }, image: 'agouti-dd.jpg' },
+  { name: 'Silberagouti dd', tokens: { A: 'A', C: 'C', D: 'd', E: 'E', G: 'g', P: 'P' }, image: 'silberagouti-dd.jpg' },
+  { name: 'Kohlfuchs dd', tokens: { A: 'a', C: 'C', D: 'd', E: 'e', G: 'G', P: 'P' }, image: 'kohlfuchs-dd.jpg' },
+  { name: 'Anthrazit dd', tokens: { A: 'a', C: 'C', D: 'd', E: 'E', G: 'g', P: 'P' }, image: 'anthrazit-dd.jpg' },
   // GEN-3a: efef gg base = Silberschimmel (breeder C5) — listed before the
   // A-specific Polarfuchsschimmel so the canonical efef-gg reverse-matches here.
-  // No A restriction: both agouti (AA) and non-agouti (aa) ef/gg = Silberschimmel.
   { name: 'Silberschimmel', tokens: { C: 'C', D: 'D', E: 'ef', G: 'g', P: 'P' }, image: 'silberschimmel.jpg' },
   { name: 'Polarfuchsschimmel', tokens: { A: 'A', C: 'C', D: 'D', E: 'ef', G: 'g', P: 'P' }, image: 'polarfuchsschimmel.jpg' },
   { name: 'Algierfuchsschimmel', tokens: { A: 'A', C: 'C', D: 'D', E: 'ef', G: 'G', P: 'P' }, image: 'algierfuchsschimmel.jpg' },
@@ -112,8 +104,8 @@ export const BASE_COLORS: readonly FarbschlagEntry[] = [
   { name: 'Rotfuchs, hell', tokens: { A: 'a', C: 'C', D: 'D', E: 'e', G: 'G', P: 'p' }, image: 'rotfuchs-hell.jpg' },
   { name: 'Kohlfuchs-Hell', tokens: { A: 'a', C: 'C', D: 'D', E: 'e', G: 'G', P: 'P' }, image: 'kohlfuchs-hell-2.jpg' },
   { name: 'Algierfuchs, hell', tokens: { A: 'A', C: 'C', D: 'D', E: 'e', G: 'G', P: 'P' }, image: 'algierfuchs-hell.JPG' },
-  { name: 'Dilute Topas', tokens: { A: 'A', C: 'C', D: 'd', E: 'E', G: 'G', P: 'p' }, image: 'topas-dd.jpg' },
-  { name: 'Dilute Blaufuchs', tokens: { A: 'a', C: 'C', D: 'd', E: 'e', G: 'g', P: 'p' }, image: 'blaufuchs-dd.jpg' },
+  { name: 'Topas dd', tokens: { A: 'A', C: 'C', D: 'd', E: 'E', G: 'G', P: 'p' }, image: 'topas-dd.jpg' },
+  { name: 'Blaufuchs dd', tokens: { A: 'a', C: 'C', D: 'd', E: 'e', G: 'g', P: 'p' }, image: 'blaufuchs-dd.jpg' },
 
   // ── GEN-3f/3g: c^chm colourpoint varieties ──
   // GEN-3f: aa points = marten/sable group (Marder/Siam, +gg Zobel/Zobel-Hell).
@@ -155,12 +147,10 @@ export interface FarbschlagMatch {
  * Expressed token at a locus. GEN-3d: an UNKNOWN allele ('?') is resolved to the
  * MOST-DOMINANT allele of the locus (the safer default) rather than acting as a
  * match-anything wildcard — so an unknown-C animal reads as full-colour 'C', not
- * a c^h/c^chm colourpoint white. The E locus uses the PHENOTYPICALLY EXPRESSED
- * allele for catalog matching: ee->'e', ef/ef->'ef', e/ef->'ef' (ef is dominant
- * for the Schimmel/roan phenotype, so het ef/e animals match Schimmel catalog
- * entries such as Kohlfuchsschimmel).  GEN-4: 'eef' removed — 'Fuchsschimmel'
- * is a Farbart/category, not a concrete Farbschlag; the catalog must name the
- * variety specifically.
+ * a c^h/c^chm colourpoint white. The E locus stays PAIR-aware so the Fuchs/
+ * Schimmel family is distinguishable: ee->'e', e/ef->'eef', ef/ef->'ef'.
+ * (The Fuchs/Schimmel FAMILY for unknown-E is still handled by eFamily on the
+ * raw pair, which runs before this.)
  */
 function locusToken(g: Genotype, locus: LocusKey): string {
   // Default an unknown allele to the WILD-TYPE reading: most-dominant for the
@@ -172,9 +162,7 @@ function locusToken(g: Genotype, locus: LocusKey): string {
   const [x, y] = g[locus].map((a) => (a === WILDCARD ? fallback : a))
   if (locus === 'E') {
     if (x === y) return x // ee->'e', efef->'ef', EE->'E'
-    // GEN-4: het ef/e → 'ef' (ef is dominant for the Schimmel phenotype;
-    // enables catalog entries like Kohlfuchsschimmel to match het animals).
-    if ((x === 'e' && y === 'ef') || (x === 'ef' && y === 'e')) return 'ef'
+    if ((x === 'e' && y === 'ef') || (x === 'ef' && y === 'e')) return 'eef'
     return dominantAllele('E', x, y) // E/ef, E/e -> 'E'
   }
   return dominantAllele(locus, x, y)
@@ -187,12 +175,10 @@ function matches(g: Genotype, entry: FarbschlagEntry): boolean {
 }
 
 /**
- * E-locus family: used to scope the catalog search to E-aware entries.
- * Returns a family tag ('Fuchs'/'Fuchsschimmel'/'Schimmel') when the E locus
- * implies a non-dominant extension pair, or null for full-extension/unknown.
- * GEN-4: these family names are Farbarten (categories), NOT concrete Farbschläge.
- * They are ONLY used here as catalog-search filters; they must NEVER appear as
- * computed farbschlag output (the farbschlagFor category guard blocks them).
+ * GEN-3c family fallback: the E locus alone names the Fuchs/Schimmel family even
+ * when other loci are unknown (so genotypes never fall through to "Unbekannt").
+ *   ee -> Fuchs | e/ef -> Fuchsschimmel | ef/ef -> Schimmel | e/? -> Fuchs (for now)
+ * Returns null when E is dominant (full colour) or fully unknown.
  */
 function eFamily(g: Genotype): string | null {
   const [x, y] = g.E
@@ -219,10 +205,7 @@ function baseColourFor(g: Genotype): string | null {
   const base = family
     ? (BASE_COLORS.find((e) => e.tokens.E !== undefined && matches(g, e)) ?? null)
     : (BASE_COLORS.find((e) => matches(g, e)) ?? null)
-  // GEN-4: never fall back to the family name — Fuchs/Fuchsschimmel/Schimmel are
-  // Farbarten (categories), not concrete Farbschläge.  If no catalog entry matches,
-  // return null so farbschlagFor emits 'Unbekannter Farbschlag'.
-  return base?.name ?? null
+  return base?.name ?? family
 }
 
 /**
@@ -250,13 +233,7 @@ function colourpointName(g: Genotype): string | null {
   }
   // A- colourpoint: base as if C were full; het (cchm/ch) -> '-Hell' suffix.
   const base = baseColourFor(makeGenotype({ ...g, C: ['C', 'C'] }))
-  if (!base) return null
-  // GEN-4: if base is a Dilute variety, prefix ordering is 'Dilute CP-X' not 'CP-Dilute X'.
-  const DILUTE = 'Dilute '
-  if (base.startsWith(DILUTE)) {
-    return `${DILUTE}CP-${base.slice(DILUTE.length)}${bothCchm ? '' : '-Hell'}`
-  }
-  return `CP-${base}${bothCchm ? '' : '-Hell'}`
+  return base ? `CP-${base}${bothCchm ? '' : '-Hell'}` : null
 }
 
 export function farbschlagFor(g: Genotype): FarbschlagMatch {
@@ -264,30 +241,8 @@ export function farbschlagFor(g: Genotype): FarbschlagMatch {
   if (locusToken(g, 'Sp') === 'Sp') modifiers.push('Schecke')
   if (locusToken(g, 'Re') === 'Re') modifiers.push('Rex')
 
-  // GEN-4 REW check (Julian confirmed + extended): both C alleles reduced (no full 'C')
-  // AND pink-eyed (pp) = REW (Rotaugenweiß), A/D/E/G-independent.
-  //   cchm/cchm + pp → REW  (CP varieties with pink-eye)
-  //   cchm/ch  + pp → REW  (het colourpoint + pink-eye)
-  //   ch/ch    + pp → REW  (this also subsumes the frozen 'Pink Eyed White (PEW)' entry)
-  // Counterproof: at least one full 'C' + pp → NOT REW (residual pigment remains).
-  const [c0, c1] = resolvedPair(g, 'C')
-  const [p0, p1] = resolvedPair(g, 'P')
-  const cReduced = (c: string) => c === 'cchm' || c === 'ch'
-  if (cReduced(c0) && cReduced(c1) && p0 === 'p' && p1 === 'p') {
-    const name = ['REW', ...modifiers].join(' ')
-    return { name, base: null, unknown: false }
-  }
-
   const baseName = colourpointName(g) ?? baseColourFor(g)
-  // GEN-4: safety guard — Farbarten (categories/families) are NEVER valid as
-  // a computed Farbschlag output.  If baseName is a category label, treat as
-  // Unbekannt instead of leaking an invalid name into the UI.
-  const CATEGORY_NAMES: ReadonlySet<string> = new Set([
-    'Standard', 'Colourpoint', 'Dilute',
-    'Fuchs', 'Fuchsschimmel', 'Schimmel',
-    'Colourpoint Dilute',
-  ])
-  if (!baseName || CATEGORY_NAMES.has(baseName)) {
+  if (!baseName) {
     return { name: UNKNOWN_FARBSCHLAG, base: null, unknown: true }
   }
   const name = [baseName, ...modifiers].join(' ')

gerbil-manager-web/src/genetics/genotype.ts

@@ -179,17 +179,11 @@ function normalizeToken(tok: string): string | null {
   t = t.replace(/S\(l\)/g, 'Sl').replace(/s\(l\)/g, 'sl')
   t = t.replace(/Uw/g, 'G').replace(/uw/g, 'g')
   // GEN-3h: accept bracket display notation → canonical internal symbols.
-  t = t.replace(/e\[f\]/g, 'ef')     // Schimmel allele display form → internal
+  // Order matters: [-] must be replaced before the plain-dash rule below.
+  t = t.replace(/\[-\]/g, '?')       // bracket-unknown [-] → internal wildcard
+  t = t.replace(/e\[f\]/g, 'ef')     // Schimmel display form → internal
   t = t.replace(/c\[chm\]/g, 'cchm') // Colourpoint display form → internal
   t = t.replace(/c\[h\]/g, 'ch')     // Himalayan display form → internal
-  // CR-1a: allele-prefixed bracket-unknown like ee[-] (Silvain).
-  // When e[-] is PRECEDED by a letter it is the second unknown allele in a
-  // 2-allele token (e.g. ee[-] → e + e[-] → e + ?).  Lookbehind strips only
-  // the e[-] part; the leading allele stays. Standalone e[-] falls through to
-  // the generic [-]→? rule below (which makes the bracket-dash a wildcard,
-  // leaving the leading allele intact for splitToken).
-  t = t.replace(/(?<=[A-Za-z])e\[-\]/g, '?')
-  t = t.replace(/\[-\]/g, '?')       // bare/standalone bracket-unknown → wildcard
   // GEN-3c: plain dash is the breeder's UNKNOWN marker on input; store internally as '?'.
   t = t.replace(/-/g, '?')
   return t

gerbil-manager-web/src/index.css

@@ -539,57 +539,28 @@ textarea {
   margin: 0.5rem 0 1rem;
   padding: 0;
   display: grid;
-  /* GEN-4: wider min-width prevents long names (CP-Silberagouti-Hell) from overflowing */
-  grid-template-columns: repeat(auto-fill, minmax(15rem, 1fr));
+  grid-template-columns: repeat(auto-fill, minmax(13rem, 1fr));
   gap: 0.5rem;
 }
 
-/* GEN-4 layout fix: image left, body centre (name + genotype stacked), prob right.
-   align-items: stretch so all three columns fill the card height consistently. */
 .farbschlag-card {
   display: flex;
   align-items: center;
+  justify-content: space-between;
   gap: 0.5rem;
   padding: 0.6rem 0.9rem;
   border: 1px solid var(--color-border);
   border-radius: 0.6rem;
   background: var(--color-surface);
-  overflow: hidden; /* contain long genotype strings */
-}
-
-.farbschlag-card__img {
-  flex-shrink: 0;
-}
-
-/* Body takes the middle space and allows wrapping for long names */
-.farbschlag-card__body {
-  flex: 1;
-  min-width: 0; /* allow flex child to shrink below content size */
-  display: flex;
-  flex-direction: column;
-  gap: 0.15rem;
 }
 
 .farbschlag-card__name {
   font-weight: 600;
-  overflow-wrap: break-word;
-  word-break: break-word;
-}
-
-/* Genotype code shown below the name — muted, small, wrappable */
-.farbschlag-card__geno {
-  font-size: 0.7rem;
-  color: var(--color-text-muted, #666);
-  overflow-wrap: break-word;
-  word-break: break-all;
-  opacity: 0.8;
 }
 
 .farbschlag-card__prob {
-  flex-shrink: 0;
   color: var(--color-accent);
   white-space: nowrap;
-  text-align: right;
 }
 
 /* UX-MOBILE-2: scroll wrapper so genotype table scrolls horizontally on mobile

gerbil-manager-web/src/pages/GerbilDetailPage.tsx

@@ -2,7 +2,6 @@ import { useMemo, useState, type ReactNode } from 'react'
 import { Link, useParams } from 'react-router-dom'
 import { de } from '../strings/de'
 import { getGerbil, updateGerbil } from '../api/gerbils'
-import { listLitters as listLittersPaged } from '../api/litters'
 import { listColorVarieties, listContacts, listEnclosures, listLitters } from '../api/lookups'
 import { useApi, useMutation } from '../hooks/useApi'
 import { formatDate, genderLabel, statusLabel } from '../format/labels'
@@ -56,10 +55,6 @@ export default function GerbilDetailPage() {
   const enclosures = useApi(() => listEnclosures(), [])
   const contacts = useApi(() => listContacts(), [])
   const litters = useApi(() => listLitters(), [])
-  const parentLitters = useApi(
-    () => listLittersPaged({ filter: `fatherId=${id}|motherId=${id}`, orderBy: 'date desc', pageSize: 50 }),
-    [id],
-  )
 
   const colorName = useMemo(
     () => new Map((colorVarieties.data ?? []).map((c) => [c.id, c.name])),
@@ -107,7 +102,7 @@ export default function GerbilDetailPage() {
       <header className="page-head">
         <div>
           <GerbilProfilePhoto gerbilId={g.id} />
-          <h2>{g.name || de.pages.gerbils.nameless}</h2>
+          <h2>{g.name}</h2>
           <span className={`badge badge--${g.status.toLowerCase()}`}>{statusLabel(g.status)}</span>
           {g.isResident === false && (
             <span className="badge badge--external" title={de.pages.gerbils.externalTitle}>
@@ -158,7 +153,7 @@ export default function GerbilDetailPage() {
         {g.status === 'Deceased' && (
           <>
             <Row label={t.fields.dateOfDeath} value={formatDate(g.dateOfDeath)} />
-            <Row label={t.fields.causeOfDeath} value={g.causeOfDeath || null} />
+            <Row label={t.fields.causeOfDeath} value={g.causeOfDeath} />
           </>
         )}
         {g.status === 'GivenAway' && (
@@ -195,7 +190,7 @@ export default function GerbilDetailPage() {
           }
         />
         <Row label={t.fields.receiver} value={lookup(contactName, g.receiverContactId)} />
-        <Row label={t.fields.notes} value={g.notes || null} />
+        <Row label={t.fields.notes} value={g.notes} />
       </dl>
 
       <h3>{t.detail.genetics}</h3>
@@ -242,32 +237,6 @@ export default function GerbilDetailPage() {
         {saveCharacter.error && <span className="error-text">{saveCharacter.error}</span>}
       </div>
 
-      <h3>{t.detail.parentLittersTitle}</h3>
-      {parentLitters.loading && <p className="muted">{de.common.loading}</p>}
-      {!parentLitters.loading && (parentLitters.data?.items.length ?? 0) === 0 && (
-        <p className="muted">{t.detail.parentLittersEmpty}</p>
-      )}
-      {(parentLitters.data?.items.length ?? 0) > 0 && (
-        <ul className="card-list">
-          {(parentLitters.data?.items ?? []).map((litter) => (
-            <li key={litter.id}>
-              <Link to={`/wuerfe/${litter.id}`} className="gerbil-card">
-                <span className="gerbil-card__name">{litter.name}</span>
-                <span className="badge badge--active">
-                  {litter.fatherId === id ? t.detail.parentLittersRoleVater : t.detail.parentLittersRoleMutter}
-                </span>
-                <span className="gerbil-card__meta">{formatDate(litter.date)}</span>
-                {litter.totalBorn !== null && (
-                  <span className="gerbil-card__meta">
-                    {litter.totalBorn} {de.pages.litters.countLabel}
-                  </span>
-                )}
-              </Link>
-            </li>
-          ))}
-        </ul>
-      )}
-
       <h3 className="visually-hidden">{t.detail.moreData}</h3>
       <div className="tabs" role="tablist">
         {(['photos', 'health', 'weight'] as const).map((key) => (

gerbil-manager-web/src/pages/GerbilFormPage.tsx

@@ -8,8 +8,6 @@ import { useApi, useMutation } from '../hooks/useApi'
 import { genderLabel, statusLabel } from '../format/labels'
 import { fromDisplayString } from '../genetics'
 import FarbschlagImage from '../components/FarbschlagImage'
-import NameSuggestPanel from '../components/NameSuggestPanel'
-import '../components/NameSuggestPanel.css'
 
 interface FormState {
   name: string
@@ -23,12 +21,10 @@ interface FormState {
   enclosureId: string
   litterId: string
   originContactId: string
-  originBreeder: string
   receiverContactId: string
   genotype: string
   notes: string
   isResident: boolean
-  isDeaf: boolean | null
 }
 
 const EMPTY: FormState = {
@@ -43,12 +39,10 @@ const EMPTY: FormState = {
   enclosureId: '',
   litterId: '',
   originContactId: '',
-  originBreeder: '',
   receiverContactId: '',
   genotype: '',
   notes: '',
   isResident: true,
-  isDeaf: null,
 }
 
 function formFromGerbil(g: {
@@ -63,12 +57,10 @@ function formFromGerbil(g: {
   enclosureId: string | null
   litterId: string | null
   originContactId: string | null
-  originBreeder?: string | null
   receiverContactId: string | null
   genotype: string | null
   notes: string | null
   isResident?: boolean | null
-  isDeaf?: boolean | null
 }): FormState {
   return {
     name: g.name,
@@ -82,12 +74,10 @@ function formFromGerbil(g: {
     enclosureId: g.enclosureId ?? '',
     litterId: g.litterId ?? '',
     originContactId: g.originContactId ?? '',
-    originBreeder: g.originBreeder ?? '',
     receiverContactId: g.receiverContactId ?? '',
     genotype: g.genotype ?? '',
     notes: g.notes ?? '',
     isResident: g.isResident ?? true,
-    isDeaf: g.isDeaf ?? null,
   }
 }
 
@@ -113,7 +103,6 @@ export default function GerbilFormPage() {
   const [form, setForm] = useState<FormState>(EMPTY)
   const [errors, setErrors] = useState<Partial<Record<keyof FormState, string>>>({})
   const [initializedFor, setInitializedFor] = useState<string | null>(null)
-  const [showNameSuggest, setShowNameSuggest] = useState(false)
 
   const existing = useApi(() => (id ? getGerbil(id) : Promise.resolve(null)), [id])
   const colorVarieties = useApi(() => listColorVarieties(), [])
@@ -178,12 +167,10 @@ export default function GerbilFormPage() {
       enclosureId: nn(form.enclosureId),
       litterId: nn(form.litterId),
       originContactId: nn(form.originContactId),
-      originBreeder: nn(form.originBreeder),
       receiverContactId: nn(form.receiverContactId),
       genotype: nn(form.genotype),
       notes: nn(form.notes),
       isResident: form.isResident,
-      isDeaf: form.isDeaf,
     }
     const result = await mutation.run(body)
     if (result.ok) navigate(`/rennmaeuse/${result.value.id}`)
@@ -200,33 +187,16 @@ export default function GerbilFormPage() {
       <h2>{isEdit ? t.form.editTitle : t.form.createTitle}</h2>
 
       <form className="form" onSubmit={onSubmit} noValidate>
-        <div className="field">
-          <label htmlFor="gerbil-name">{t.fields.name} *</label>
-          <div className="namegen-name-row">
-            <input
-              id="gerbil-name"
-              className="input"
-              value={form.name}
-              onChange={(e) => set('name', e.target.value)}
-              aria-invalid={Boolean(errors.name)}
-            />
-            <button
-              type="button"
-              className="btn"
-              onClick={() => setShowNameSuggest((v) => !v)}
-            >
-              {de.namegen.button}
-            </button>
-          </div>
-          {errors.name && <small className="error-text">{errors.name}</small>}
-        </div>
-        {showNameSuggest && (
-          <NameSuggestPanel
-            gender={form.gender}
-            onPick={(name) => { set('name', name); setShowNameSuggest(false) }}
-            onClose={() => setShowNameSuggest(false)}
+        <label className="field">
+          <span>{t.fields.name} *</span>
+          <input
+            className="input"
+            value={form.name}
+            onChange={(e) => set('name', e.target.value)}
+            aria-invalid={Boolean(errors.name)}
           />
-        )}
+          {errors.name && <small className="error-text">{errors.name}</small>}
+        </label>
 
         <label className="field">
           <span>{t.fields.gender} *</span>
@@ -356,16 +326,6 @@ export default function GerbilFormPage() {
           </select>
         </label>
 
-        <label className="field">
-          <span>{t.fields.originBreeder}</span>
-          <input
-            className="input"
-            value={form.originBreeder}
-            placeholder="z. B. Zucht der Kleinen Chaoten"
-            onChange={(e) => set('originBreeder', e.target.value)}
-          />
-        </label>
-
         <label className="field">
           <span>{t.fields.receiver}</span>
           <select
@@ -400,21 +360,6 @@ export default function GerbilFormPage() {
           <textarea value={form.notes} onChange={(e) => set('notes', e.target.value)} />
         </label>
 
-        <label className="field">
-          <span>{t.fields.isDeaf}</span>
-          <select
-            value={form.isDeaf === null ? '' : String(form.isDeaf)}
-            onChange={(e) => {
-              const v = e.target.value
-              set('isDeaf', v === '' ? null : v === 'true')
-            }}
-          >
-            <option value="">{t.form.isDeafUnknown}</option>
-            <option value="true">{t.form.isDeafYes}</option>
-            <option value="false">{t.form.isDeafNo}</option>
-          </select>
-        </label>
-
         <label className="field field--check" title={t.form.isResidentHint}>
           <span>{t.form.isResidentLabel}</span>
           <input

gerbil-manager-web/src/pages/GerbilsPage.tsx

@@ -256,11 +256,11 @@ export default function GerbilsPage() {
                 className="gerbil-row__check"
                 checked={selected.has(g.id)}
                 onChange={() => toggleSelect(g.id)}
-                aria-label={g.name || t.nameless}
+                aria-label={g.name}
               />
               <Link to={`/rennmaeuse/${g.id}`} className="gerbil-card">
                 <span className="gerbil-card__name">
-                  {g.name || t.nameless}
+                  {g.name}
                   {g.isResident === false && (
                     <span className="badge badge--external" title={t.externalTitle}>
                       {t.externalBadge}

gerbil-manager-web/src/pages/StammbaumPage.tsx

@@ -276,7 +276,7 @@ export default function StammbaumPage() {
     <>
       <section className="page stammbaum-screen">
         <header className="page-head">
-          <h2>{t.titleFor(root.gerbil.name || de.pages.gerbils.nameless)}</h2>
+          <h2>{t.titleFor(root.gerbil.name)}</h2>
           <div className="head-actions">
             <Link to={`/rennmaeuse/${root.gerbil.id}`} className="btn">
               {t.backToAnimal}
@@ -377,13 +377,7 @@ function PedigreeCard({
       <div className="pedigree-card__body">
         <div className="pedigree-card__name">
           <SexIcon gender={g.gender} />
-          <Link
-            to={`/rennmaeuse/${g.id}`}
-            className="pedigree-card__nametext"
-            onClick={(e) => e.stopPropagation()}
-          >
-            {g.name || de.pages.gerbils.nameless}
-          </Link>
+          <span className="pedigree-card__nametext">{g.name}</span>
         </div>
         {farbschlag && (
           <span
@@ -445,7 +439,7 @@ function PrintPedigree({
   return (
     <div className="stammbaum-print">
       <header className="stammbaum-print__head">
-        <h1>{t.titleFor(root.gerbil.name || de.pages.gerbils.nameless)}</h1>
+        <h1>{t.titleFor(root.gerbil.name)}</h1>
         <p className="stammbaum-print__meta">
           {t.inbreeding.label}: {inbreedingText} · {t.printView.createdOn} {today}
         </p>
@@ -500,7 +494,7 @@ function PrintCell({
     <div className={base} style={style}>
       <div className="stammbaum-print__name">
         {sexSymbol}
-        {g.name || de.pages.gerbils.nameless}
+        {g.name}
       </div>
       {g.dateOfBirth && (
         <div className="stammbaum-print__sub">

gerbil-manager-web/src/pages/VertragWizardPage.tsx

@@ -326,7 +326,7 @@ export default function VertragWizardPage() {
                     checked={selectedIds.has(g.id)}
                     onChange={() => toggleAnimal(g.id)}
                   />
-                  <span className="wizard-pick__name">{g.name || de.pages.gerbils.nameless}</span>
+                  <span className="wizard-pick__name">{g.name}</span>
                   <span className="wizard-pick__meta">
                     {[
                       genderLabel(g.gender),
@@ -396,7 +396,7 @@ export default function VertragWizardPage() {
             </div>
             <div className="def-row">
               <dt>{de.pages.vertraege.fields.animals}</dt>
-              <dd>{selectedAnimals.map((g) => g.name || de.pages.gerbils.nameless).join(', ')}</dd>
+              <dd>{selectedAnimals.map((g) => g.name).join(', ')}</dd>
             </div>
             <div className="def-row">
               <dt>{de.pages.vertraege.fields.price}</dt>

gerbil-manager-web/src/pages/WurfFormPage.tsx

@@ -71,9 +71,9 @@ export default function WurfFormPage() {
       name: l.name,
       date: l.date ?? '',
       fatherId: l.fatherId ?? '',
-      fatherName: l.fatherId ? (nameById.get(l.fatherId) || de.pages.gerbils.nameless) : '',
+      fatherName: l.fatherId ? (nameById.get(l.fatherId) ?? '') : '',
       motherId: l.motherId ?? '',
-      motherName: l.motherId ? (nameById.get(l.motherId) || de.pages.gerbils.nameless) : '',
+      motherName: l.motherId ? (nameById.get(l.motherId) ?? '') : '',
       totalBorn: l.totalBorn != null ? String(l.totalBorn) : '',
       expectedGoHomeDate: l.expectedGoHomeDate ?? '',
       notes: l.notes ?? '',
@@ -178,7 +178,7 @@ export default function WurfFormPage() {
           ) : (
             <AnimalPicker
               gender="male"
-              onPick={(g) => setForm((f) => ({ ...f, fatherId: g.id, fatherName: g.name || de.pages.gerbils.nameless }))}
+              onPick={(g) => setForm((f) => ({ ...f, fatherId: g.id, fatherName: g.name }))}
             />
           )}
         </fieldset>
@@ -199,7 +199,7 @@ export default function WurfFormPage() {
           ) : (
             <AnimalPicker
               gender="female"
-              onPick={(g) => setForm((f) => ({ ...f, motherId: g.id, motherName: g.name || de.pages.gerbils.nameless }))}
+              onPick={(g) => setForm((f) => ({ ...f, motherId: g.id, motherName: g.name }))}
             />
           )}
         </fieldset>

gerbil-manager-web/src/pages/stammbaum.css

@@ -134,12 +134,6 @@
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  color: inherit;
-  text-decoration: none;
-}
-
-.pedigree-card__nametext:hover {
-  text-decoration: underline;
 }
 
 .pedigree-card__sex--male {

gerbil-manager-web/src/strings/de.ts

@@ -38,7 +38,6 @@ export const de = {
   pages: {
     gerbils: {
       title: 'Rennmäuse',
-      nameless: '(ohne Namen)',
       // Liste
       newButton: 'Neue Rennmaus',
       empty: 'Keine Rennmäuse gefunden.',
@@ -80,8 +79,6 @@ export const de = {
         enclosure: 'Gehege',
         colorVariety: 'Farbschlag',
         origin: 'Herkunft',
-        originBreeder: 'Herkunft (Freitext)',
-        isDeaf: 'Gehörlos',
         receiver: 'Abnehmer',
         genotype: 'Genotyp',
         notes: 'Notizen',
@@ -105,11 +102,6 @@ export const de = {
         tabPlaceholder: 'Dieser Bereich entsteht in einem späteren Schritt.',
         notFound: 'Diese Rennmaus wurde nicht gefunden.',
         moreData: 'Weitere Daten',
-        // ANIMAL-LITTERS: Würfe als Elternteil
-        parentLittersTitle: 'Würfe als Elternteil',
-        parentLittersEmpty: 'Keine Würfe als Elternteil erfasst.',
-        parentLittersRoleVater: 'Vater',
-        parentLittersRoleMutter: 'Mutter',
       },
       // Formular (anlegen/bearbeiten)
       form: {
@@ -121,9 +113,6 @@ export const de = {
         // BESTAND-FILTER: Zugehörigkeit zum eigenen Bestand (sonst externe Ahne)
         isResidentLabel: 'Gehört zum eigenen Bestand',
         isResidentHint: 'Abwählen für externe Ahnen, die nur für den Stammbaum erfasst sind.',
-        isDeafUnknown: 'Unbekannt',
-        isDeafYes: 'Ja',
-        isDeafNo: 'Nein',
         save: 'Speichern',
         cancel: 'Abbrechen',
         saving: 'Speichern …',
@@ -818,19 +807,6 @@ export const de = {
     resetButton: 'Filter zurücksetzen',
     closeButton: 'Schließen',
   },
-  // ── FEAT-NAMEGEN: Namensvorschläge (KI-gestützt, UC-1 Einzeltier) ──
-  namegen: {
-    button: 'Name vorschlagen',
-    panelTitle: 'Namensvorschläge',
-    letterLabel: 'Anfangsbuchstabe',
-    letterPlaceholder: 'z. B. A',
-    usagesLabel: 'Herkunftskultur',
-    loadButton: 'Vorschläge laden',
-    loading: 'Lade Vorschläge …',
-    empty: 'Keine Vorschläge — andere Einstellungen versuchen.',
-    keyMissing: 'Namensvorschläge benötigen einen API-Key — bitte in den Einstellungen konfigurieren.',
-    close: 'Schließen',
-  },
 } as const
 
 export type Strings = typeof de

tools/import/conflict-decisions.json

@@ -84,34 +84,6 @@
       "decision": "E-locus = ee[f] (Fuchs). This is the mother of animal 'C' (c-29042024) — un-quarantining her links C's second parent. Name in v.d. spelling (workaround from Re-Import #2); both spellings now match after FIX-1 (canon_pair identity).",
       "genotype": "Aa CC D- ee[f] Gg pp Spsp [DP]",
       "source": "Julian 2026-06-06 — HUMANQUESTION D4"
-    },
-    {
-      "name": "Little Runner's Big Ben",
-      "dob": "03.02.2020",
-      "decision": "P-locus = Pp (not PP) — the two sources differed only at P",
-      "genotype": "Aa Cc[chm] DD Ee Gg Pp Spsp",
-      "source": "Julian 2026-06-07 — HUMANQUESTION D6"
-    },
-    {
-      "name": "Vance Jr. von den Kleinen Chaoten",
-      "dob": "10.04.2022",
-      "decision": "Sp-locus = spsp (kleines spsp, ungescheckt) — die Quellen unterschieden sich nur bei Sp (Spsp // spsp). C-Locus 'c[hm]' im Extrakt → als c[chm] normalisiert (kein gültiges Symbol; c[chm] = offensichtliche Absicht).",
-      "genotype": "aa Cc[chm] Dd Ee gg P- spsp",
-      "source": "Julian 2026-06-07 — HUMANQUESTION D6"
-    },
-    {
-      "name": "Skarlett von den Kleinen Chaoten",
-      "dob": "14.07.2013",
-      "decision": "death date = 17.04.2016 (the '2018' variant was wrong — it had leaked as '/ +2018' into the genotype field; parse-leak already fixed in IMPORT-POLISH)",
-      "dateOfDeath": "17.04.2016",
-      "source": "Julian 2026-06-07 — HUMANQUESTION D6"
-    },
-    {
-      "name": "Kazu von den Kleinen Chaoten",
-      "dob": "23.04.2013",
-      "decision": "E-locus = ee[f], G-locus = GG (one source wrote UwUw = GG in international notation), P-locus = PP — resolves the 3 contested loci",
-      "genotype": "Aa Cc[chm] DD ee[f] GG PP Spsp",
-      "source": "Julian 2026-06-07 — HUMANQUESTION D6"
     }
   ]
 }

tools/import/extract.py

@@ -129,9 +129,7 @@ def norm_zucht(z):
     if not z:
         return ""
     n = z.lower()
-    # TOLERANT KC-MATCHER FIX: trailing \b after '.' never fires when next char is ' '
-    # (both are non-word chars), so "v.d. kleinen" was NOT stripped. Drop the trailing \b.
-    n = re.sub(r"\bv\.\s?d\.", " ", n)
+    n = re.sub(r"\bv\.\s?d\.\b", " ", n)
     n = re.sub(r"\b(zucht|privatzucht|der|die|den|des|dem|von|of)\b", " ", n)
     n = re.sub(r"[^a-z0-9äöüß ]", " ", n)
     words = [w[:-1] if len(w) > 4 and w.endswith("n") else w for w in n.split()]
@@ -139,15 +137,6 @@ def norm_zucht(z):
     return ZUCHT_ALIASES.get(key, key)
 
 
-def is_clan_zucht(z):
-    """True if the zucht name (raw or canonical) identifies the Kleine Chaoten home cattery.
-
-    Accepts all known spellings: 'Zucht der Kleinen Chaoten', 'kleinen Chaoten',
-    'v.d. Kleinen Chaoten', '[ZdkC]', 'kleinechaote', etc.
-    """
-    return norm_zucht(z) == "kleinechaote"
-
-
 def canon_pair(raw):
     """Full raw name -> (normalised call-name, canonical zucht)."""
     name, zucht = split_name_zucht(raw)
@@ -973,19 +962,7 @@ def apply_conflict_decisions(merged, conflicts, path):
             continue
         a["resolvedByDecision"] = True
         if d.get("genotype"):
-            # CR-10: validate the parsed genotype — a typo'd decision string yields empty
-            # mapped8locus and would silently blank the animal's genotype while marking it
-            # 'resolved'. Only apply if the parse produces non-empty loci.
-            parsed = gt.parse(d["genotype"])
-            if parsed.get("mapped8locus"):
-                a["genotype"] = parsed
-            else:
-                # Keep the existing genotype; flag as a warning in the report.
-                a.setdefault("decisionWarnings", []).append(
-                    f"Ungültiger Override-Genotyp '{d['genotype']}' — "
-                    "konnte nicht geparst werden (mapped8locus leer). "
-                    "Bestehender Genotyp behalten; Konflikt wurde trotzdem aufgelöst."
-                )
+            a["genotype"] = gt.parse(d["genotype"])
         if d.get("farbschlag"):
             a["farbschlag"] = d["farbschlag"]
             a["farbschlagVariants"] = [d["farbschlag"]]

tools/import/test_extract.py

@@ -280,63 +280,6 @@ check("gen.+v.d. name rejected", e.looks_like_animal_name("Victoria Welby gen. W
 check("real Farbschlag accepted", not e.looks_like_animal_name("Kohlfuchsschimmel"))
 check("real Farbschlag accepted 2", not e.looks_like_animal_name("Orangeschimmel, hell"))
 
-# --- CR-10: malformed decision genotype must NOT blank the existing genotype ---
-dec_cr10 = os.path.join(tempfile.gettempdir(), "decisions-cr10.json")
-_json.dump({"resolutions": [
-    # Valid decision (genotype parses OK) -> should be applied
-    {"name": "Agouti OK", "dob": "01.01.2020", "decision": "test",
-     "genotype": "aa CC DD ee GG PP spsp rere", "source": "test"},
-    # Malformed genotype (typo'd) -> must NOT blank genotype; conflict still resolved
-    {"name": "Siamese Bad", "dob": "02.02.2020", "decision": "test",
-     "genotype": "BLÖDSINN!!!", "source": "test"},
-]}, open(dec_cr10, "w", encoding="utf-8"))
-merged_cr10 = [
-    {"id": "g1", "name": "Agouti OK", "dob": "01.01.2020", "conflict": True, "farbschlag": "", "death": "",
-     "genotype": {"mapped8locus": {"A": ["a","a"]}, "rawGenotype": "aa", "unmappedTokens": []}},
-    {"id": "g2", "name": "Siamese Bad", "dob": "02.02.2020", "conflict": True, "farbschlag": "", "death": "",
-     "genotype": {"mapped8locus": {"C": ["c^h","c^h"]}, "rawGenotype": "chmchm", "unmappedTokens": []}},
-]
-conflicts_cr10 = [{"id": "g1"}, {"id": "g2"}]
-n_cr10 = e.apply_conflict_decisions(merged_cr10, conflicts_cr10, dec_cr10)
-check("CR-10: valid decision genotype is applied (A-locus updated)",
-      merged_cr10[0]["genotype"]["mapped8locus"].get("C") == ["C","C"])
-check("CR-10: malformed decision genotype NOT applied (C-locus preserved)",
-      merged_cr10[1]["genotype"]["mapped8locus"].get("C") == ["c^h","c^h"])
-check("CR-10: malformed decision still un-quarantines the animal",
-      merged_cr10[1].get("conflict") is False)
-check("CR-10: malformed decision adds a decisionWarning",
-      bool(merged_cr10[1].get("decisionWarnings")))
-check("CR-10: apply returns correct resolved count (2 conflicts cleared)", n_cr10 == 2)
-try: os.remove(dec_cr10)
-except OSError: pass
-
-# --- TOLERANT KC-MATCHER (IMPORT-BACKFILL): all clan spelling variants -> canon 'kleinechaote' ---
-# Julian-Entscheidung: Zucht = Kleine Chaoten wenn 'klein'+'chaoten' ODER bekannte Abkürzungen.
-# The v.d. fix: trailing \b after '.' failed when next char is ' ' (non-word), so
-# "v.d. kleinen chaoten" was NOT stripped before. Fix: drop the trailing \b.
-check("KC-matcher: 'Zucht der Kleinen Chaoten'",
-      e.is_clan_zucht("Zucht der Kleinen Chaoten"))
-check("KC-matcher: 'kleinen Chaoten' (no prefix)",
-      e.is_clan_zucht("kleinen Chaoten"))
-check("KC-matcher: 'v.d. Kleinen Chaoten' (v.d. prefix — was broken before fix)",
-      e.is_clan_zucht("v.d. Kleinen Chaoten"))
-check("KC-matcher: '[ZdkC]' shorthand (bracket form, alias in ZUCHT_ALIASES)",
-      e.is_clan_zucht("ZdkC"))
-check("KC-matcher: 'von den Kleinen Chaoten' (full long form)",
-      e.is_clan_zucht("von den Kleinen Chaoten"))
-check("KC-matcher: empty string -> NOT clan",
-      not e.is_clan_zucht(""))
-check("KC-matcher: 'Black Forest' -> NOT clan",
-      not e.is_clan_zucht("Black Forest"))
-check("KC-matcher: norm_zucht regression — 'Kleine Chaoten' (base form still works)",
-      e.norm_zucht("Kleine Chaoten") == "kleinechaote")
-check("KC-matcher: norm_zucht regression — 'von den Kleinen Chaoten'",
-      e.norm_zucht("von den Kleinen Chaoten") == "kleinechaote")
-# Decision-matching FIX-1 already tested above; v.d. in decision matches 'von den' in record
-# because both reduce to the same canon_pair. Verify norm_zucht directly for v.d.:
-check("KC-matcher: norm_zucht('v.d. Kleinen Chaoten') == 'kleinechaote' (was broken before fix)",
-      e.norm_zucht("v.d. Kleinen Chaoten") == "kleinechaote")
-
 if failed:
     print(f"\n{failed} test(s) FAILED")
     sys.exit(1)