FORM-FIELDS-1: originBreeder + isDeaf in GerbilFormPage

- types.ts: isDeaf?: boolean|null in Gerbil + CreateGerbil (UpdateGerbil erbt via Partial)
- de.ts: fields.originBreeder, fields.isDeaf; form.isDeafUnknown/Yes/No
- GerbilFormPage: originBreeder Freitext-Input (neben originContactId-Dropdown); isDeaf Tristate-Select (Unbekannt/Ja/Nein); round-trip load→display→save

e2e: 2 neue Tests (originBreeder Freitext + isDeaf Tristate round-trip)

Gate: vitest 82/82, e2e 146/146, tsc clean
Rebase auf Pams CR-2 folgt nach deren Merge.

.gitea/workflows/ci.yml

@@ -48,19 +48,6 @@ jobs:
       - name: Build
         run: dotnet build GerbilManager.slnx --no-restore -c Release
 
-      - name: dotnet-ef Tool installieren
-        run: dotnet tool install --global dotnet-ef --version 10.0.*
-
-      - 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 -c 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

@@ -580,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/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

@@ -81,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 =>

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/Import/ImportModels.cs

@@ -102,8 +102,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

@@ -145,63 +145,25 @@ namespace GerbilManagerWebAPI.Import
                 .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));
@@ -507,33 +469,6 @@ namespace GerbilManagerWebAPI.Import
             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").
@@ -589,8 +524,6 @@ namespace GerbilManagerWebAPI.Import
             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(
@@ -599,7 +532,7 @@ 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,
@@ -637,23 +570,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

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/ApplicationContextModelSnapshot.cs

@@ -807,10 +807,6 @@ namespace GerbilManagerWebAPI.Migrations
 
                     b.HasIndex("EnclosureId");
 
-                    b.HasIndex("ExternalRef")
-                        .IsUnique()
-                        .HasFilter("\"ExternalRef\" IS NOT NULL");
-
                     b.HasIndex("LitterId");
 
                     b.HasIndex("OriginContactId");

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;
 
@@ -47,17 +46,7 @@ builder.Services.AddHttpClient<GerbilManagerWebAPI.Inbox.DraftReplyService>(
     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>();

deploy/truenas/.env.example

@@ -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-2.0-flash
+# Claude-API-Key fuer KI-Verkaufstext (FEAT-12a; leer lassen wenn nicht vorhanden)
+ANTHROPIC_API_KEY=

deploy/truenas/compose.yaml

@@ -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-2.0-flash}"
+      # 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:

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

@@ -53,12 +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('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/src/genetics/__tests__/genetics.test.ts

@@ -222,9 +222,8 @@ describe('Farbschlag catalog', () => {
     expect(CATALOG).toHaveLength(CATALOG_SIZE)
     expect(CATALOG[0]).toMatchObject({ name: 'Pink Eyed White (PEW)', sortOrder: 0 })
     // Every row has a non-empty canonical genotype display string and unique name.
-    // GEN-3h: bracket notation (e[f], c[chm], c[h]) allowed in tokens.
     expect(new Set(CATALOG.map((c) => c.name)).size).toBe(CATALOG.length)
-    expect(CATALOG.every((c) => /^[A-Za-z[\]?-]+( [A-Za-z[\]?-]+){7}$/.test(c.canonicalGenotype))).toBe(true)
+    expect(CATALOG.every((c) => /^[A-Za-z?]+( [A-Za-z?]+){7}$/.test(c.canonicalGenotype))).toBe(true)
   })
 
   it('genotypeToFarbschlag (DATA-1 denormalization contract) returns the plain name', () => {
@@ -524,99 +523,3 @@ describe('GEN-3g: "-Hell" in variety name == cchm/ch het; hom == cchm/cchm', ()
     expect(name('aa cchmch DD EE gg PP spsp rere')).toBe('Zobel-Hell')
   })
 })
-
-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]', () => {
-    // Fuchsschimmel: E=[ef,ef] hom
-    expect(toDisplayString(fromDisplayString('AA CC DD efef GG PP spsp rere'))).toBe(
-      'AA CC DD e[f]e[f] GG PP spsp rere',
-    )
-    // C-locus het: cchm + ch
-    expect(toDisplayString(fromDisplayString('aa cchmch DD EE GG PP spsp rere'))).toBe(
-      'aa c[chm]c[h] DD EE GG PP spsp rere',
-    )
-    // C-locus hom cchm
-    expect(toDisplayString(fromDisplayString('aa cchmcchm DD EE GG PP spsp rere'))).toBe(
-      'aa c[chm]c[chm] DD EE GG PP spsp rere',
-    )
-  })
-
-  // ── E-locus display order: E > e > e[f] ─────────────────────────────
-  it('Fuchsschimmel het pair {ef,e} displays as ee[f] (e before e[f])', () => {
-    // Stored canonical: [ef, e] (ef dominant over e in storage).
-    // Display must swap to [e, ef] per breeder convention.
-    const g = fromDisplayString('aa CC DD eef Gg Pp spsp rere')
-    expect(g.E).toEqual(['ef', 'e']) // storage order unchanged
-    expect(toDisplayString(g)).toBe('aa CC DD ee[f] Gg Pp spsp rere')
-  })
-
-  it('E+e stays Ee (E dominant over e, no swap needed)', () => {
-    expect(toDisplayString(fromDisplayString('aa CC DD Ee GG PP spsp rere'))).toBe(
-      'aa CC DD Ee GG PP spsp rere',
-    )
-  })
-
-  it('E+ef displays Ee[f] (E dominant stays first, ef renders as e[f])', () => {
-    expect(toDisplayString(fromDisplayString('aa CC DD Eef GG PP spsp rere'))).toBe(
-      'aa CC DD Ee[f] GG PP spsp rere',
-    )
-  })
-
-  // ── Julian oracle fixtures (HUMANQUESTION D3/D4) ─────────────────────
-  it('Tier C: oracle display string round-trips exactly (aa C- D- ee[f] Gg Pp spsp rere)', () => {
-    const display = 'aa C- D- ee[f] Gg Pp spsp rere'
-    const g = fromDisplayString(display)
-    expect(g.E).toEqual(['ef', 'e'])
-    expect(g.C).toEqual(['C', '?'])
-    expect(toDisplayString(g)).toBe(display)
-    // Farbschlag scope is outside GEN-3h; god confirmed colour is correct as-is.
-  })
-
-  it('Zuleika oracle: aa c[chm]c[h] DD Ee Gg PP spsp rere', () => {
-    const display = 'aa c[chm]c[h] DD Ee Gg PP spsp rere'
-    const g = fromDisplayString(display)
-    expect(g.C).toEqual(['cchm', 'ch'])
-    expect(g.E).toEqual(['E', 'e'])
-    expect(toDisplayString(g)).toBe(display)
-  })
-
-  it('Milka oracle: aa Cc[h] dd EE Gg P- Spsp rere', () => {
-    const display = 'aa Cc[h] dd EE Gg P- Spsp rere'
-    const g = fromDisplayString(display)
-    expect(g.C).toEqual(['C', 'ch'])
-    expect(g.D).toEqual(['d', 'd'])
-    expect(toDisplayString(g)).toBe(display)
-  })
-
-  // ── Parser accepts both forms ─────────────────────────────────────────
-  it('bracket input round-trips identically to internal-symbol input', () => {
-    expect(toDisplayString(fromDisplayString('AA c[chm]c[chm] DD EE GG PP spsp rere'))).toBe(
-      toDisplayString(fromDisplayString('AA cchmcchm DD EE GG PP spsp rere')),
-    )
-    expect(toDisplayString(fromDisplayString('AA CC DD e[f]e[f] GG PP spsp rere'))).toBe(
-      toDisplayString(fromDisplayString('AA CC DD efef GG PP spsp rere')),
-    )
-    expect(toDisplayString(fromDisplayString('AA CC DD ee[f] GG PP spsp rere'))).toBe(
-      toDisplayString(fromDisplayString('AA CC DD eef GG PP spsp rere')),
-    )
-  })
-
-  it('e[-] standalone: parses as [e,?], displays 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/colorVarietySeed.generated.json

@@ -2,35 +2,35 @@
   {
     "name": "Pink Eyed White (PEW)",
     "english": "Pink Eyed White",
-    "canonicalGenotype": "AA c[h]c[h] DD EE GG pp spsp rere",
+    "canonicalGenotype": "AA chch DD EE GG pp spsp rere",
     "sortOrder": 0,
     "image": "rotaugen-weiss-pew-d-sep-e-sep.jpg"
   },
   {
     "name": "Hermelin",
     "english": "Dark Tailed White",
-    "canonicalGenotype": "aa c[h]c[h] DD EE GG PP spsp rere",
+    "canonicalGenotype": "aa chch DD EE GG PP spsp rere",
     "sortOrder": 1,
     "image": "hermelin.jpeg"
   },
   {
     "name": "Himalaya",
     "english": "Himalayan",
-    "canonicalGenotype": "AA c[h]c[h] DD EE GG PP spsp rere",
+    "canonicalGenotype": "AA chch DD EE GG PP spsp rere",
     "sortOrder": 2,
     "image": "himalaya.jpg"
   },
   {
     "name": "Zobel",
     "english": "Sable",
-    "canonicalGenotype": "aa c[chm]c[chm] DD EE gg PP spsp rere",
+    "canonicalGenotype": "aa cchmcchm DD EE gg PP spsp rere",
     "sortOrder": 3,
     "image": "zobel.jpeg"
   },
   {
     "name": "Rotaugenschimmel",
     "english": "Red-Eyed Roan",
-    "canonicalGenotype": "AA CC DD e[f]e[f] GG pp spsp rere",
+    "canonicalGenotype": "AA CC DD efef GG pp spsp rere",
     "sortOrder": 4,
     "image": "rotaugen-schimmel.jpg"
   },
@@ -168,7 +168,7 @@
   },
   {
     "name": "Orangeschimmel",
-    "canonicalGenotype": "AA CC DD e[f]e[f] GG PP spsp rere",
+    "canonicalGenotype": "AA CC DD efef GG PP spsp rere",
     "sortOrder": 25,
     "image": "schimmel-orangeschimmel.jpg"
   },
@@ -210,31 +210,31 @@
   },
   {
     "name": "Silberschimmel",
-    "canonicalGenotype": "AA CC DD e[f]e[f] gg PP spsp rere",
+    "canonicalGenotype": "AA CC DD efef gg PP spsp rere",
     "sortOrder": 32,
     "image": "silberschimmel.jpg"
   },
   {
     "name": "Polarfuchsschimmel",
-    "canonicalGenotype": "AA CC DD e[f]e[f] gg PP spsp rere",
+    "canonicalGenotype": "AA CC DD efef gg PP spsp rere",
     "sortOrder": 33,
     "image": "polarfuchsschimmel.jpg"
   },
   {
     "name": "Algierfuchsschimmel",
-    "canonicalGenotype": "AA CC DD e[f]e[f] GG PP spsp rere",
+    "canonicalGenotype": "AA CC DD efef GG PP spsp rere",
     "sortOrder": 34,
     "image": "algierfuchsschimmel.jpg"
   },
   {
     "name": "Kohlfuchsschimmel",
-    "canonicalGenotype": "aa CC DD e[f]e[f] GG PP spsp rere",
+    "canonicalGenotype": "aa CC DD efef GG PP spsp rere",
     "sortOrder": 35,
     "image": "kohlfuchsschimmel.jpg"
   },
   {
     "name": "Blaufuchsschimmel",
-    "canonicalGenotype": "aa CC DD e[f]e[f] gg PP spsp rere",
+    "canonicalGenotype": "aa CC DD efef gg PP spsp rere",
     "sortOrder": 36,
     "image": "blaufuchsschimmel.jpg"
   },
@@ -252,7 +252,7 @@
   },
   {
     "name": "Goldfuchsschimmel",
-    "canonicalGenotype": "AA CC DD e[f]e[f] GG pp spsp rere",
+    "canonicalGenotype": "AA CC DD efef GG pp spsp rere",
     "sortOrder": 39,
     "image": "goldfuchsschimmel.jpg"
   },
@@ -270,7 +270,7 @@
   },
   {
     "name": "Rotfuchsschimmel",
-    "canonicalGenotype": "aa CC DD e[f]e[f] GG pp spsp rere",
+    "canonicalGenotype": "aa CC DD efef GG pp spsp rere",
     "sortOrder": 42,
     "image": "rotfuchsschimmel.jpg"
   },
@@ -282,7 +282,7 @@
   },
   {
     "name": "Kohlfuchsschimmel, hell",
-    "canonicalGenotype": "aa CC DD e[f]e[f] GG PP spsp rere",
+    "canonicalGenotype": "aa CC DD efef GG PP spsp rere",
     "sortOrder": 44,
     "image": "kohlfuchsschimmel-hell.jpg"
   },
@@ -318,89 +318,89 @@
   },
   {
     "name": "Marder",
-    "canonicalGenotype": "aa c[chm]c[chm] DD EE GG PP spsp rere",
+    "canonicalGenotype": "aa cchmcchm DD EE GG PP spsp rere",
     "sortOrder": 50,
     "image": "marder.JPG"
   },
   {
     "name": "Siam",
-    "canonicalGenotype": "aa c[chm]c[h] DD EE GG PP spsp rere",
+    "canonicalGenotype": "aa cchmch DD EE GG PP spsp rere",
     "sortOrder": 51,
     "image": "siam-marder-hell.JPG"
   },
   {
     "name": "Zobel-Hell",
-    "canonicalGenotype": "aa c[chm]c[h] DD EE gg PP spsp rere",
+    "canonicalGenotype": "aa cchmch DD EE gg PP spsp rere",
     "sortOrder": 52,
     "image": "zobel-hell.jpg"
   },
   {
     "name": "CP-Agouti",
-    "canonicalGenotype": "AA c[chm]c[chm] DD EE GG PP spsp rere",
+    "canonicalGenotype": "AA cchmcchm DD EE GG PP spsp rere",
     "sortOrder": 53,
     "image": "agouti-cp.jpg"
   },
   {
     "name": "CP-Agouti-Hell",
-    "canonicalGenotype": "AA c[chm]c[h] DD EE GG PP spsp rere",
+    "canonicalGenotype": "AA cchmch DD EE GG PP spsp rere",
     "sortOrder": 54
   },
   {
     "name": "CP-Silberagouti",
-    "canonicalGenotype": "AA c[chm]c[chm] DD EE gg PP spsp rere",
+    "canonicalGenotype": "AA cchmcchm DD EE gg PP spsp rere",
     "sortOrder": 55,
     "image": "silberagouti-cp.JPG"
   },
   {
     "name": "CP-Silberagouti-Hell",
-    "canonicalGenotype": "AA c[chm]c[h] DD EE gg PP spsp rere",
+    "canonicalGenotype": "AA cchmch DD EE gg PP spsp rere",
     "sortOrder": 56
   },
   {
     "name": "CP-Algierfuchs",
-    "canonicalGenotype": "AA c[chm]c[chm] DD ee GG PP spsp rere",
+    "canonicalGenotype": "AA cchmcchm DD ee GG PP spsp rere",
     "sortOrder": 57,
     "image": "algierfuchs-cp.jpg"
   },
   {
     "name": "CP-Algierfuchs-Hell",
-    "canonicalGenotype": "AA c[chm]c[h] DD ee GG PP spsp rere",
+    "canonicalGenotype": "AA cchmch DD ee GG PP spsp rere",
     "sortOrder": 58
   },
   {
     "name": "CP-Polarfuchs",
-    "canonicalGenotype": "AA c[chm]c[chm] DD ee gg PP spsp rere",
+    "canonicalGenotype": "AA cchmcchm DD ee gg PP spsp rere",
     "sortOrder": 59,
     "image": "polarfuchs-cp.jpg"
   },
   {
     "name": "CP-Polarfuchs-Hell",
-    "canonicalGenotype": "AA c[chm]c[h] DD ee gg PP spsp rere",
+    "canonicalGenotype": "AA cchmch DD ee gg PP spsp rere",
     "sortOrder": 60
   },
   {
     "name": "CP-Fuchs",
-    "canonicalGenotype": "AA c[chm]c[chm] dd ee GG PP spsp rere",
+    "canonicalGenotype": "AA cchmcchm dd ee GG PP spsp rere",
     "sortOrder": 61
   },
   {
     "name": "CP-Fuchs-Hell",
-    "canonicalGenotype": "AA c[chm]c[h] dd ee GG PP spsp rere",
+    "canonicalGenotype": "AA cchmch dd ee GG PP spsp rere",
     "sortOrder": 62
   },
   {
     "name": "CP-Blaufuchs",
-    "canonicalGenotype": "AA c[chm]c[chm] dd ee gg PP spsp rere",
+    "canonicalGenotype": "AA cchmcchm dd ee gg PP spsp rere",
     "sortOrder": 63
   },
   {
     "name": "CP-Orangeschimmel",
-    "canonicalGenotype": "AA c[chm]c[chm] DD e[f]e[f] GG PP spsp rere",
+    "canonicalGenotype": "AA cchmcchm DD efef GG PP spsp rere",
     "sortOrder": 64
   },
   {
     "name": "CP-Orangeschimmel-Hell",
-    "canonicalGenotype": "AA c[chm]c[h] DD e[f]e[f] GG PP spsp rere",
+    "canonicalGenotype": "AA cchmch DD efef GG PP spsp rere",
     "sortOrder": 65
   }
 ]

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

@@ -74,32 +74,6 @@ export function wildType(): Genotype {
   return out
 }
 
-/**
- * GEN-3h: breeder bracket-notation display symbols.
- * STORAGE symbols (ef / cchm / ch) are frozen; only the rendered form changes.
- */
-const DISPLAY_SYMBOL: Readonly<Partial<Record<string, string>>> = {
-  ef: 'e[f]',
-  cchm: 'c[chm]',
-  ch: 'c[h]',
-}
-function displaySymbol(allele: string): string {
-  return DISPLAY_SYMBOL[allele] ?? allele
-}
-
-/**
- * GEN-3h: E-locus display order — breeder convention is E > e > e[f].
- * Storage/dominance order is E > ef > e; display swaps ef and e so that
- * a Fuchsschimmel (E=[ef,e] stored) renders as "ee[f]" not "e[f]e".
- */
-const E_DISPLAY_RANK: Readonly<Record<string, number>> = { E: 0, e: 1, ef: 2 }
-
-function displayPair(locus: LocusKey, pair: AllelePair): AllelePair {
-  if (locus !== 'E') return pair
-  const rank = (x: string) => E_DISPLAY_RANK[x] ?? Number.MAX_SAFE_INTEGER
-  return rank(pair[0]) <= rank(pair[1]) ? pair : [pair[1], pair[0]]
-}
-
 /**
  * Compact display string, e.g. "Aa CC Dd EE GG Pp spsp rere".
  * The Sls locus is OMITTED when wild-type (sl/sl) so legacy 8-locus strings and
@@ -107,18 +81,12 @@ function displayPair(locus: LocusKey, pair: AllelePair): AllelePair {
  * (e.g. "… spsp rere Slsl"). Round-trips: a missing Sls re-parses to sl/sl.
  * GEN-3c: unknown alleles are STORED as '?' but DISPLAYED as '-' (breeder
  * convention) — e.g. ['C','?'] renders "C-".
- * GEN-3h: sub-alleles use breeder bracket notation (e[f], c[chm], c[h]);
- * E-locus display order is E > e > e[f] (e before e[f] in het pairs).
  */
 export function toDisplayString(g: Genotype): string {
   return LOCUS_ORDER.filter(
     (locus) => locus !== 'Sls' || !(g.Sls[0] === 'sl' && g.Sls[1] === 'sl'),
   )
-    .map((locus) => {
-      const [a, b] = displayPair(locus, g[locus])
-      return displaySymbol(a) + displaySymbol(b)
-    })
-    .map((s) => s.replace(/\?/g, '-'))
+    .map((locus) => (g[locus][0] + g[locus][1]).replace(/\?/g, '-'))
     .join(' ')
 }
 
@@ -178,19 +146,8 @@ function normalizeToken(tok: string): string | null {
   if (t === 'WP') t = 'Slsl'
   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
-  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 '?'.
+  // GEN-3c: '-' is the breeder's UNKNOWN marker on input; store internally as '?'
+  // (the frozen storage contract keeps '?'; only DISPLAY renders '-').
   t = t.replace(/-/g, '?')
   return t
 }

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,7 +377,7 @@ function PedigreeCard({
       <div className="pedigree-card__body">
         <div className="pedigree-card__name">
           <SexIcon gender={g.gender} />
-          <span className="pedigree-card__nametext">{g.name || de.pages.gerbils.nameless}</span>
+          <span className="pedigree-card__nametext">{g.name}</span>
         </div>
         {farbschlag && (
           <span
@@ -439,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>
@@ -494,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>

tools/import/extract.py

@@ -973,19 +973,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,36 +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