Ajout d'un script pour installation automatique du produit

Ajout d'une partie mise à jour automatique : plus besoin de docker pull en ligne de commande ; on peut passer par l'interface
Refactoring partie Java pour respecter d'avantage le DDD : plus de jackson dans la partie domain

Passage version 0.6.6

core/src/test/java/com/loremind/application/campaigncontext/SceneServiceTest.java

@@ -178,10 +178,7 @@ public class SceneServiceTest {
     @Test
     void testUpdateScene_WithValidBranches() {
         // Arrange
-        SceneBranch branch = SceneBranch.builder()
-                .targetSceneId("scene-2")
-                .label("Go to scene 2")
-                .build();
+        SceneBranch branch = SceneBranch.of("Go to scene 2", "scene-2");
         Scene updatedScene = Scene.builder()
                 .name("Updated Scene")
                 .branches(List.of(branch))
@@ -203,10 +200,7 @@ public class SceneServiceTest {
     @Test
     void testUpdateScene_WithBranchToSelf() {
         // Arrange
-        SceneBranch branch = SceneBranch.builder()
-                .targetSceneId("scene-1")
-                .label("Self-reference")
-                .build();
+        SceneBranch branch = SceneBranch.of("Self-reference", "scene-1");
         Scene updatedScene = Scene.builder()
                 .name("Updated Scene")
                 .branches(List.of(branch))
@@ -228,10 +222,7 @@ public class SceneServiceTest {
     @Test
     void testUpdateScene_WithBranchToDifferentChapter() {
         // Arrange
-        SceneBranch branch = SceneBranch.builder()
-                .targetSceneId("scene-other-chapter")
-                .label("Go to other chapter")
-                .build();
+        SceneBranch branch = SceneBranch.of("Go to other chapter", "scene-other-chapter");
         Scene updatedScene = Scene.builder()
                 .name("Updated Scene")
                 .branches(List.of(branch))
@@ -253,10 +244,7 @@ public class SceneServiceTest {
     @Test
     void testUpdateScene_WithBranchNullTarget() {
         // Arrange
-        SceneBranch branch = SceneBranch.builder()
-                .targetSceneId(null)
-                .label("Null target")
-                .build();
+        SceneBranch branch = SceneBranch.of("Null target", null);
         Scene updatedScene = Scene.builder()
                 .name("Updated Scene")
                 .branches(List.of(branch))
@@ -277,10 +265,7 @@ public class SceneServiceTest {
     @Test
     void testUpdateScene_WithBranchBlankTarget() {
         // Arrange
-        SceneBranch branch = SceneBranch.builder()
-                .targetSceneId("   ")
-                .label("Blank target")
-                .build();
+        SceneBranch branch = SceneBranch.of("Blank target", "   ");
         Scene updatedScene = Scene.builder()
                 .name("Updated Scene")
                 .branches(List.of(branch))

core/src/test/java/com/loremind/application/generationcontext/CampaignStructuralContextBuilderTest.java

@@ -74,9 +74,9 @@ public class CampaignStructuralContextBuilderTest {
 
         CampaignStructuralContext ctx = builder.build("camp-1");
 
-        assertEquals("Les Terres Brisées", ctx.getCampaignName());
-        assertEquals("Campagne dark fantasy", ctx.getCampaignDescription());
-        assertTrue(ctx.getArcs().isEmpty());
+        assertEquals("Les Terres Brisées", ctx.campaignName());
+        assertEquals("Campagne dark fantasy", ctx.campaignDescription());
+        assertTrue(ctx.arcs().isEmpty());
     }
 
     @Test
@@ -100,19 +100,19 @@ public class CampaignStructuralContextBuilderTest {
 
         CampaignStructuralContext ctx = builder.build("camp-1");
 
-        assertEquals(2, ctx.getArcs().size());
-        assertEquals("Arc A", ctx.getArcs().get(0).getName());
-        assertEquals("Arc B", ctx.getArcs().get(1).getName());
+        assertEquals(2, ctx.arcs().size());
+        assertEquals("Arc A", ctx.arcs().get(0).name());
+        assertEquals("Arc B", ctx.arcs().get(1).name());
 
         // Chapitres tries : ch2 (order 1) avant ch1 (order 2)
-        assertEquals(2, ctx.getArcs().get(0).getChapters().size());
-        assertEquals("Ch B", ctx.getArcs().get(0).getChapters().get(0).getName());
-        assertEquals("Ch A", ctx.getArcs().get(0).getChapters().get(1).getName());
+        assertEquals(2, ctx.arcs().get(0).chapters().size());
+        assertEquals("Ch B", ctx.arcs().get(0).chapters().get(0).name());
+        assertEquals("Ch A", ctx.arcs().get(0).chapters().get(1).name());
 
         // Scenes dans ch-1 : s2 (order 1) avant s1 (order 2)
-        var chADto = ctx.getArcs().get(0).getChapters().get(1);
-        assertEquals("Scene B", chADto.getScenes().get(0).getName());
-        assertEquals("Scene A", chADto.getScenes().get(1).getName());
+        var chADto = ctx.arcs().get(0).chapters().get(1);
+        assertEquals("Scene B", chADto.scenes().get(0).name());
+        assertEquals("Scene A", chADto.scenes().get(1).name());
     }
 
     @Test
@@ -120,15 +120,8 @@ public class CampaignStructuralContextBuilderTest {
         Arc arc = Arc.builder().id("arc-1").name("Arc").description("").order(1).build();
         Chapter ch = Chapter.builder().id("ch-1").arcId("arc-1").name("Ch").description("").order(1).build();
 
-        SceneBranch validBranch = SceneBranch.builder()
-                .label("Si les joueurs fuient")
-                .targetSceneId("s-2")
-                .condition("en cas de combat perdu")
-                .build();
-        SceneBranch danglingBranch = SceneBranch.builder()
-                .label("Vers l'inconnu")
-                .targetSceneId("s-inconnu")
-                .build();
+        SceneBranch validBranch = new SceneBranch("Si les joueurs fuient", "s-2", "en cas de combat perdu");
+        SceneBranch danglingBranch = SceneBranch.of("Vers l'inconnu", "s-inconnu");
 
         Scene s1 = Scene.builder().id("s-1").chapterId("ch-1").name("Entrée").description("")
                 .order(1)
@@ -143,12 +136,12 @@ public class CampaignStructuralContextBuilderTest {
 
         CampaignStructuralContext ctx = builder.build("camp-1");
 
-        var scene1Summary = ctx.getArcs().get(0).getChapters().get(0).getScenes().get(0);
-        assertEquals(2, scene1Summary.getBranches().size());
-        assertEquals("Fuite", scene1Summary.getBranches().get(0).getTargetSceneName());
-        assertEquals("en cas de combat perdu", scene1Summary.getBranches().get(0).getCondition());
+        var scene1Summary = ctx.arcs().get(0).chapters().get(0).scenes().get(0);
+        assertEquals(2, scene1Summary.branches().size());
+        assertEquals("Fuite", scene1Summary.branches().get(0).targetSceneName());
+        assertEquals("en cas de combat perdu", scene1Summary.branches().get(0).condition());
         // ID inconnu → libellé de fallback
-        assertEquals("(scène inconnue)", scene1Summary.getBranches().get(1).getTargetSceneName());
+        assertEquals("(scène inconnue)", scene1Summary.branches().get(1).targetSceneName());
     }
 
     @Test
@@ -170,9 +163,9 @@ public class CampaignStructuralContextBuilderTest {
 
         CampaignStructuralContext ctx = builder.build("camp-1");
 
-        assertEquals(2, ctx.getArcs().get(0).getIllustrationCount());
-        assertEquals(0, ctx.getArcs().get(0).getChapters().get(0).getIllustrationCount());
-        assertEquals(1, ctx.getArcs().get(0).getChapters().get(0).getScenes().get(0).getIllustrationCount());
-        assertTrue(ctx.getArcs().get(0).getChapters().get(0).getScenes().get(0).getBranches().isEmpty());
+        assertEquals(2, ctx.arcs().get(0).illustrationCount());
+        assertEquals(0, ctx.arcs().get(0).chapters().get(0).illustrationCount());
+        assertEquals(1, ctx.arcs().get(0).chapters().get(0).scenes().get(0).illustrationCount());
+        assertTrue(ctx.arcs().get(0).chapters().get(0).scenes().get(0).branches().isEmpty());
     }
 }

core/src/test/java/com/loremind/application/generationcontext/GeneratePageValuesUseCaseTest.java

@@ -89,13 +89,13 @@ public class GeneratePageValuesUseCaseTest {
         verify(aiProvider).generatePage(captor.capture());
         GenerationContext ctx = captor.getValue();
 
-        assertEquals("Aetheria", ctx.getLoreName());
-        assertEquals("monde aérien", ctx.getLoreDescription());
-        assertEquals("PNJ", ctx.getFolderName());
-        assertEquals("Personnage", ctx.getTemplateName());
-        assertEquals("Alice", ctx.getPageTitle());
+        assertEquals("Aetheria", ctx.loreName());
+        assertEquals("monde aérien", ctx.loreDescription());
+        assertEquals("PNJ", ctx.folderName());
+        assertEquals("Personnage", ctx.templateName());
+        assertEquals("Alice", ctx.pageTitle());
         // Seuls les champs TEXT doivent etre envoyes (pas "Portrait" IMAGE).
-        assertEquals(List.of("Histoire", "Apparence"), ctx.getTemplateFields());
+        assertEquals(List.of("Histoire", "Apparence"), ctx.templateFields());
     }
 
     @Test

core/src/test/java/com/loremind/application/generationcontext/LoreStructuralContextBuilderTest.java

@@ -71,10 +71,10 @@ public class LoreStructuralContextBuilderTest {
 
         LoreStructuralContext ctx = builder.build("lore-1");
 
-        assertEquals("Aetheria", ctx.getLoreName());
-        assertEquals("Monde aérien", ctx.getLoreDescription());
-        assertTrue(ctx.getFolders().isEmpty());
-        assertTrue(ctx.getTags().isEmpty());
+        assertEquals("Aetheria", ctx.loreName());
+        assertEquals("Monde aérien", ctx.loreDescription());
+        assertTrue(ctx.folders().isEmpty());
+        assertTrue(ctx.tags().isEmpty());
     }
 
     @Test
@@ -110,32 +110,32 @@ public class LoreStructuralContextBuilderTest {
 
         LoreStructuralContext ctx = builder.build("lore-1");
 
-        assertEquals(2, ctx.getFolders().size());
-        assertTrue(ctx.getFolders().containsKey("PNJ"));
-        assertTrue(ctx.getFolders().containsKey("Lieux"));
+        assertEquals(2, ctx.folders().size());
+        assertTrue(ctx.folders().containsKey("PNJ"));
+        assertTrue(ctx.folders().containsKey("Lieux"));
 
-        var pnjPages = ctx.getFolders().get("PNJ");
+        var pnjPages = ctx.folders().get("PNJ");
         assertEquals(1, pnjPages.size());
         var aliceSummary = pnjPages.get(0);
-        assertEquals("Alice", aliceSummary.getTitle());
-        assertEquals("Personnage", aliceSummary.getTemplateName());
+        assertEquals("Alice", aliceSummary.title());
+        assertEquals("Personnage", aliceSummary.templateName());
         // Blank/null filtrés
-        assertEquals(1, aliceSummary.getValues().size());
-        assertEquals("Il était une fois...", aliceSummary.getValues().get("Histoire"));
-        assertEquals(List.of("hero", "magic"), aliceSummary.getTags());
+        assertEquals(1, aliceSummary.values().size());
+        assertEquals("Il était une fois...", aliceSummary.values().get("Histoire"));
+        assertEquals(List.of("hero", "magic"), aliceSummary.tags());
         // p-2 resolved into title, p-ghost dropped silently
-        assertEquals(List.of("La Forêt"), aliceSummary.getRelatedPageTitles());
+        assertEquals(List.of("La Forêt"), aliceSummary.relatedPageTitles());
 
-        var forestSummary = ctx.getFolders().get("Lieux").get(0);
+        var forestSummary = ctx.folders().get("Lieux").get(0);
         // Template introuvable → "?"
-        assertEquals("?", forestSummary.getTemplateName());
-        assertTrue(forestSummary.getValues().isEmpty());
-        assertTrue(forestSummary.getRelatedPageTitles().isEmpty());
+        assertEquals("?", forestSummary.templateName());
+        assertTrue(forestSummary.values().isEmpty());
+        assertTrue(forestSummary.relatedPageTitles().isEmpty());
 
         // Tags uniques entre les 2 pages
-        assertEquals(2, ctx.getTags().size());
-        assertTrue(ctx.getTags().contains("hero"));
-        assertTrue(ctx.getTags().contains("magic"));
+        assertEquals(2, ctx.tags().size());
+        assertTrue(ctx.tags().contains("hero"));
+        assertTrue(ctx.tags().contains("magic"));
     }
 
     @Test
@@ -160,7 +160,7 @@ public class LoreStructuralContextBuilderTest {
 
         LoreStructuralContext ctx = builder.build("lore-1");
 
-        String truncated = ctx.getFolders().get("PNJ").get(0).getValues().get("Histoire");
+        String truncated = ctx.folders().get("PNJ").get(0).values().get("Histoire");
         assertNotNull(truncated);
         assertEquals(500 + 1, truncated.length()); // 500 + ellipse
         assertTrue(truncated.endsWith("…"));
@@ -185,9 +185,9 @@ public class LoreStructuralContextBuilderTest {
 
         LoreStructuralContext ctx = builder.build("lore-1");
 
-        var summary = ctx.getFolders().get("PNJ").get(0);
-        assertTrue(summary.getValues().isEmpty());
-        assertTrue(summary.getTags().isEmpty());
-        assertTrue(summary.getRelatedPageTitles().isEmpty());
+        var summary = ctx.folders().get("PNJ").get(0);
+        assertTrue(summary.values().isEmpty());
+        assertTrue(summary.tags().isEmpty());
+        assertTrue(summary.relatedPageTitles().isEmpty());
     }
 }

core/src/test/java/com/loremind/application/generationcontext/NarrativeEntityContextBuilderTest.java

@@ -44,14 +44,14 @@ public class NarrativeEntityContextBuilderTest {
 
         NarrativeEntityContext ctx = builder.build("arc", "arc-1");
 
-        assertEquals("arc", ctx.getEntityType());
-        assertEquals("L'arc sombre", ctx.getTitle());
-        assertEquals("synopsis", ctx.getFields().get("description (synopsis)"));
-        assertEquals("trahison", ctx.getFields().get("themes"));
-        assertEquals("vie ou mort", ctx.getFields().get("stakes"));
-        assertEquals("pouvoir", ctx.getFields().get("rewards"));
-        assertEquals("le roi meurt", ctx.getFields().get("resolution"));
-        assertEquals("secret", ctx.getFields().get("gmNotes"));
+        assertEquals("arc", ctx.entityType());
+        assertEquals("L'arc sombre", ctx.title());
+        assertEquals("synopsis", ctx.fields().get("description (synopsis)"));
+        assertEquals("trahison", ctx.fields().get("themes"));
+        assertEquals("vie ou mort", ctx.fields().get("stakes"));
+        assertEquals("pouvoir", ctx.fields().get("rewards"));
+        assertEquals("le roi meurt", ctx.fields().get("resolution"));
+        assertEquals("secret", ctx.fields().get("gmNotes"));
     }
 
     @Test
@@ -64,12 +64,12 @@ public class NarrativeEntityContextBuilderTest {
 
         NarrativeEntityContext ctx = builder.build("chapter", "ch-1");
 
-        assertEquals("chapter", ctx.getEntityType());
-        assertEquals("Chapitre 1", ctx.getTitle());
-        assertEquals("", ctx.getFields().get("description (synopsis)"));
-        assertEquals("", ctx.getFields().get("playerObjectives"));
-        assertEquals("haut", ctx.getFields().get("narrativeStakes"));
-        assertEquals("", ctx.getFields().get("gmNotes"));
+        assertEquals("chapter", ctx.entityType());
+        assertEquals("Chapitre 1", ctx.title());
+        assertEquals("", ctx.fields().get("description (synopsis)"));
+        assertEquals("", ctx.fields().get("playerObjectives"));
+        assertEquals("haut", ctx.fields().get("narrativeStakes"));
+        assertEquals("", ctx.fields().get("gmNotes"));
     }
 
     @Test
@@ -85,17 +85,17 @@ public class NarrativeEntityContextBuilderTest {
 
         NarrativeEntityContext ctx = builder.build("scene", "s-1");
 
-        assertEquals("scene", ctx.getEntityType());
-        assertEquals("L'auberge", ctx.getTitle());
-        assertEquals("lieu calme", ctx.getFields().get("description"));
-        assertEquals("Taverne", ctx.getFields().get("location"));
-        assertEquals("Soir", ctx.getFields().get("timing"));
-        assertEquals("tendue", ctx.getFields().get("atmosphere"));
-        assertEquals("Vous entrez...", ctx.getFields().get("playerNarration"));
-        assertEquals("option A...", ctx.getFields().get("choicesConsequences"));
-        assertEquals("moyen", ctx.getFields().get("combatDifficulty"));
-        assertEquals("3 bandits", ctx.getFields().get("enemies"));
-        assertEquals("trésor caché", ctx.getFields().get("gmSecretNotes"));
+        assertEquals("scene", ctx.entityType());
+        assertEquals("L'auberge", ctx.title());
+        assertEquals("lieu calme", ctx.fields().get("description"));
+        assertEquals("Taverne", ctx.fields().get("location"));
+        assertEquals("Soir", ctx.fields().get("timing"));
+        assertEquals("tendue", ctx.fields().get("atmosphere"));
+        assertEquals("Vous entrez...", ctx.fields().get("playerNarration"));
+        assertEquals("option A...", ctx.fields().get("choicesConsequences"));
+        assertEquals("moyen", ctx.fields().get("combatDifficulty"));
+        assertEquals("3 bandits", ctx.fields().get("enemies"));
+        assertEquals("trésor caché", ctx.fields().get("gmSecretNotes"));
     }
 
     @Test
@@ -104,7 +104,7 @@ public class NarrativeEntityContextBuilderTest {
         when(arcRepository.findById("arc-1")).thenReturn(Optional.of(arc));
 
         NarrativeEntityContext ctx = builder.build("  ARC  ", "arc-1");
-        assertEquals("arc", ctx.getEntityType());
+        assertEquals("arc", ctx.entityType());
     }
 
     @Test

core/src/test/java/com/loremind/application/generationcontext/StreamChatForCampaignUseCaseTest.java

@@ -55,9 +55,7 @@ public class StreamChatForCampaignUseCaseTest {
     @SuppressWarnings("unchecked")
     @BeforeEach
     void setUp() {
-        campaignCtx = CampaignStructuralContext.builder()
-                .campaignName("X").campaignDescription("d")
-                .build();
+        campaignCtx = new CampaignStructuralContext("X", "d", List.of(), List.of());
         messages = List.of();
         onUsage = mock(Consumer.class);
         onToken = mock(Consumer.class);
@@ -85,10 +83,10 @@ public class StreamChatForCampaignUseCaseTest {
         ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
         verify(aiChatProvider).streamChat(captor.capture(), eq(onUsage), eq(onToken), eq(onComplete), eq(onError));
         ChatRequest req = captor.getValue();
-        assertSame(campaignCtx, req.getCampaignContext());
-        assertNull(req.getLoreContext());
-        assertNull(req.getNarrativeEntity());
-        assertNull(req.getPageContext());
+        assertSame(campaignCtx, req.campaignContext());
+        assertNull(req.loreContext());
+        assertNull(req.narrativeEntity());
+        assertNull(req.pageContext());
         verifyNoInteractions(loreContextBuilder);
         verifyNoInteractions(narrativeEntityContextBuilder);
     }
@@ -96,8 +94,8 @@ public class StreamChatForCampaignUseCaseTest {
     @Test
     void testExecute_LinkedCampaign_LoadsLoreContext() {
         Campaign linked = Campaign.builder().id("c-1").name("C").loreId("lore-1").build();
-        LoreStructuralContext loreCtx = LoreStructuralContext.builder()
-                .loreName("L").loreDescription("d").folders(Collections.emptyMap()).build();
+        LoreStructuralContext loreCtx = new LoreStructuralContext(
+                "L", "d", Collections.emptyMap(), List.of());
 
         when(campaignRepository.findById("c-1")).thenReturn(Optional.of(linked));
         when(campaignContextBuilder.build("c-1")).thenReturn(campaignCtx);
@@ -107,7 +105,7 @@ public class StreamChatForCampaignUseCaseTest {
 
         ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
         verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
-        assertSame(loreCtx, captor.getValue().getLoreContext());
+        assertSame(loreCtx, captor.getValue().loreContext());
     }
 
     @Test
@@ -122,15 +120,14 @@ public class StreamChatForCampaignUseCaseTest {
 
         ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
         verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
-        assertNull(captor.getValue().getLoreContext());
+        assertNull(captor.getValue().loreContext());
         // La requete doit tout de meme partir (pas d'exception).
     }
 
     @Test
     void testExecute_WithEntityFocus_BuildsNarrativeEntity() {
         Campaign standalone = Campaign.builder().id("c-1").name("C").loreId(null).build();
-        NarrativeEntityContext entity = NarrativeEntityContext.builder()
-                .entityType("scene").title("L'auberge").fields(Map.of()).build();
+        NarrativeEntityContext entity = new NarrativeEntityContext("scene", "L'auberge", Map.of());
 
         when(campaignRepository.findById("c-1")).thenReturn(Optional.of(standalone));
         when(campaignContextBuilder.build("c-1")).thenReturn(campaignCtx);
@@ -140,7 +137,7 @@ public class StreamChatForCampaignUseCaseTest {
 
         ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
         verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
-        assertSame(entity, captor.getValue().getNarrativeEntity());
+        assertSame(entity, captor.getValue().narrativeEntity());
     }
 
     @Test
@@ -153,7 +150,7 @@ public class StreamChatForCampaignUseCaseTest {
 
         ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
         verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
-        assertNull(captor.getValue().getNarrativeEntity());
+        assertNull(captor.getValue().narrativeEntity());
         verifyNoInteractions(narrativeEntityContextBuilder);
     }
 }

core/src/test/java/com/loremind/application/generationcontext/StreamChatForLoreUseCaseTest.java

@@ -55,10 +55,7 @@ public class StreamChatForLoreUseCaseTest {
     @SuppressWarnings("unchecked")
     @BeforeEach
     void setUp() {
-        loreCtx = LoreStructuralContext.builder()
-                .loreName("Aetheria").loreDescription("d")
-                .folders(Collections.emptyMap())
-                .build();
+        loreCtx = new LoreStructuralContext("Aetheria", "d", Collections.emptyMap(), List.of());
         messages = List.of();
         onUsage = mock(Consumer.class);
         onToken = mock(Consumer.class);
@@ -75,9 +72,9 @@ public class StreamChatForLoreUseCaseTest {
         ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
         verify(aiChatProvider).streamChat(captor.capture(), eq(onUsage), eq(onToken), eq(onComplete), eq(onError));
         ChatRequest req = captor.getValue();
-        assertSame(loreCtx, req.getLoreContext());
-        assertNull(req.getPageContext());
-        assertNull(req.getCampaignContext());
+        assertSame(loreCtx, req.loreContext());
+        assertNull(req.pageContext());
+        assertNull(req.campaignContext());
     }
 
     @Test
@@ -88,7 +85,7 @@ public class StreamChatForLoreUseCaseTest {
 
         ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
         verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
-        assertNull(captor.getValue().getPageContext());
+        assertNull(captor.getValue().pageContext());
         verifyNoInteractions(pageRepository);
     }
 
@@ -116,12 +113,12 @@ public class StreamChatForLoreUseCaseTest {
         ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
         verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
         ChatRequest req = captor.getValue();
-        assertNotNull(req.getPageContext());
-        assertEquals("Alice", req.getPageContext().getTitle());
-        assertEquals("Personnage", req.getPageContext().getTemplateName());
+        assertNotNull(req.pageContext());
+        assertEquals("Alice", req.pageContext().title());
+        assertEquals("Personnage", req.pageContext().templateName());
         // Seuls les champs TEXT exposes
-        assertEquals(List.of("Histoire"), req.getPageContext().getTemplateFields());
-        assertEquals(values, req.getPageContext().getValues());
+        assertEquals(List.of("Histoire"), req.pageContext().templateFields());
+        assertEquals(values, req.pageContext().values());
     }
 
     @Test
@@ -137,12 +134,12 @@ public class StreamChatForLoreUseCaseTest {
 
         ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
         verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
-        var pageCtx = captor.getValue().getPageContext();
+        var pageCtx = captor.getValue().pageContext();
         assertNotNull(pageCtx);
-        assertEquals("Orphan", pageCtx.getTitle());
-        assertEquals("?", pageCtx.getTemplateName());
-        assertTrue(pageCtx.getTemplateFields().isEmpty());
-        assertTrue(pageCtx.getValues().isEmpty());
+        assertEquals("Orphan", pageCtx.title());
+        assertEquals("?", pageCtx.templateName());
+        assertTrue(pageCtx.templateFields().isEmpty());
+        assertTrue(pageCtx.values().isEmpty());
         verifyNoInteractions(templateRepository);
     }
 
@@ -160,9 +157,9 @@ public class StreamChatForLoreUseCaseTest {
 
         ArgumentCaptor<ChatRequest> captor = ArgumentCaptor.forClass(ChatRequest.class);
         verify(aiChatProvider).streamChat(captor.capture(), any(), any(), any(), any());
-        var pageCtx = captor.getValue().getPageContext();
-        assertEquals("?", pageCtx.getTemplateName());
-        assertTrue(pageCtx.getTemplateFields().isEmpty());
+        var pageCtx = captor.getValue().pageContext();
+        assertEquals("?", pageCtx.templateName());
+        assertTrue(pageCtx.templateFields().isEmpty());
     }
 
     @Test

core/src/test/java/com/loremind/domain/campaigncontext/SceneBranchTest.java

@@ -9,48 +9,36 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 /**
  * Tests unitaires pour SceneBranch (Value Object).
  * Verifie :
- *  - l'immuabilite (pas de setters : seul le builder permet la construction),
- *  - l'egalite structurelle generee par @Value (equals/hashCode sur tous les
+ *  - l'immuabilite (record : aucun setter, constructeur canonique uniquement),
+ *  - l'egalite structurelle generee par record (equals/hashCode sur tous les
  *    champs) — deux branches aux memes champs sont strictement egales,
  *  - le support du champ optionnel {@code condition}.
  */
 class SceneBranchTest {
 
     @Test
-    void builder_exposesAllFields() {
-        SceneBranch branch = SceneBranch.builder()
-                .label("Si les joueurs attaquent le garde")
-                .targetSceneId("sc-combat")
-                .condition("initiative > 15")
-                .build();
+    void constructor_exposesAllFields() {
+        SceneBranch branch = new SceneBranch(
+                "Si les joueurs attaquent le garde",
+                "sc-combat",
+                "initiative > 15");
 
-        assertEquals("Si les joueurs attaquent le garde", branch.getLabel());
-        assertEquals("sc-combat", branch.getTargetSceneId());
-        assertEquals("initiative > 15", branch.getCondition());
+        assertEquals("Si les joueurs attaquent le garde", branch.label());
+        assertEquals("sc-combat", branch.targetSceneId());
+        assertEquals("initiative > 15", branch.condition());
     }
 
     @Test
     void condition_isOptional() {
-        SceneBranch branch = SceneBranch.builder()
-                .label("sortie par la porte")
-                .targetSceneId("sc-corridor")
-                .build();
+        SceneBranch branch = SceneBranch.of("sortie par la porte", "sc-corridor");
 
-        assertNull(branch.getCondition());
+        assertNull(branch.condition());
     }
 
     @Test
     void twoBranches_withSameFields_areEqual() {
-        SceneBranch a = SceneBranch.builder()
-                .label("fuite")
-                .targetSceneId("sc-2")
-                .condition(null)
-                .build();
-        SceneBranch b = SceneBranch.builder()
-                .label("fuite")
-                .targetSceneId("sc-2")
-                .condition(null)
-                .build();
+        SceneBranch a = new SceneBranch("fuite", "sc-2", null);
+        SceneBranch b = new SceneBranch("fuite", "sc-2", null);
 
         assertEquals(a, b);
         assertEquals(a.hashCode(), b.hashCode());
@@ -58,16 +46,16 @@ class SceneBranchTest {
 
     @Test
     void twoBranches_differingOnTargetSceneId_areNotEqual() {
-        SceneBranch a = SceneBranch.builder().label("X").targetSceneId("sc-1").build();
-        SceneBranch b = SceneBranch.builder().label("X").targetSceneId("sc-2").build();
+        SceneBranch a = SceneBranch.of("X", "sc-1");
+        SceneBranch b = SceneBranch.of("X", "sc-2");
 
         assertNotEquals(a, b);
     }
 
     @Test
     void twoBranches_differingOnCondition_areNotEqual() {
-        SceneBranch a = SceneBranch.builder().label("X").targetSceneId("sc-1").condition("A").build();
-        SceneBranch b = SceneBranch.builder().label("X").targetSceneId("sc-1").condition("B").build();
+        SceneBranch a = new SceneBranch("X", "sc-1", "A");
+        SceneBranch b = new SceneBranch("X", "sc-1", "B");
 
         assertNotEquals(a, b);
     }

core/src/test/java/com/loremind/domain/campaigncontext/SceneTest.java

@@ -60,15 +60,15 @@ class SceneTest {
 
     @Test
     void builder_preservesBranches_whenProvided() {
-        SceneBranch b1 = SceneBranch.builder().label("fuite").targetSceneId("sc-2").build();
-        SceneBranch b2 = SceneBranch.builder().label("combat").targetSceneId("sc-3").build();
+        SceneBranch b1 = SceneBranch.of("fuite", "sc-2");
+        SceneBranch b2 = SceneBranch.of("combat", "sc-3");
 
         Scene scene = Scene.builder()
                 .branches(List.of(b1, b2))
                 .build();
 
         assertEquals(2, scene.getBranches().size());
-        assertEquals("fuite", scene.getBranches().get(0).getLabel());
-        assertEquals("sc-3", scene.getBranches().get(1).getTargetSceneId());
+        assertEquals("fuite", scene.getBranches().get(0).label());
+        assertEquals("sc-3", scene.getBranches().get(1).targetSceneId());
     }
 }

core/src/test/java/com/loremind/domain/generationcontext/CampaignStructuralContextTest.java

@@ -6,108 +6,97 @@ import com.loremind.domain.generationcontext.CampaignStructuralContext.ChapterSu
 import com.loremind.domain.generationcontext.CampaignStructuralContext.SceneSummary;
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests unitaires pour CampaignStructuralContext et ses types imbriques.
- * Focus sur les annotations @Singular (chapters/scenes/branches/arcs) qui
- * permettent une construction incrementale du graphe narratif.
+ * Records purs : aucune dependance technique.
  */
 class CampaignStructuralContextTest {
 
     @Test
-    void builder_constructsFullNarrativeTree() {
-        BranchHint branch = BranchHint.builder()
-                .label("si les PJ fuient")
-                .targetSceneName("La poursuite")
-                .condition("PJ < moitie des HP")
-                .build();
+    void constructor_buildsFullNarrativeTree() {
+        BranchHint branch = new BranchHint("si les PJ fuient", "La poursuite", "PJ < moitie des HP");
 
-        SceneSummary scene = SceneSummary.builder()
-                .name("L'auberge")
-                .description("Rencontre tendue avec le tavernier")
-                .illustrationCount(2)
-                .branch(branch)
-                .build();
+        SceneSummary scene = new SceneSummary(
+                "L'auberge",
+                "Rencontre tendue avec le tavernier",
+                2,
+                List.of(branch));
 
-        ChapterSummary chapter = ChapterSummary.builder()
-                .name("L'arrivee")
-                .description("Les PJ decouvrent la ville")
-                .scene(scene)
-                .build();
+        ChapterSummary chapter = new ChapterSummary(
+                "L'arrivee",
+                "Les PJ decouvrent la ville",
+                0,
+                List.of(scene));
 
-        ArcSummary arc = ArcSummary.builder()
-                .name("Acte I")
-                .description("Mise en place")
-                .illustrationCount(1)
-                .chapter(chapter)
-                .build();
+        ArcSummary arc = new ArcSummary(
+                "Acte I",
+                "Mise en place",
+                1,
+                List.of(chapter));
 
-        CampaignStructuralContext ctx = CampaignStructuralContext.builder()
-                .campaignName("Les Ombres")
-                .campaignDescription("Une campagne dark fantasy")
-                .arc(arc)
-                .build();
+        CampaignStructuralContext ctx = new CampaignStructuralContext(
+                "Les Ombres",
+                "Une campagne dark fantasy",
+                List.of(arc),
+                List.of());
 
-        assertEquals("Les Ombres", ctx.getCampaignName());
-        assertEquals(1, ctx.getArcs().size());
-        assertEquals(1, ctx.getArcs().get(0).getChapters().size());
-        assertEquals(1, ctx.getArcs().get(0).getChapters().get(0).getScenes().size());
-        assertEquals(1, ctx.getArcs().get(0).getChapters().get(0).getScenes().get(0).getBranches().size());
+        assertEquals("Les Ombres", ctx.campaignName());
+        assertEquals(1, ctx.arcs().size());
+        assertEquals(1, ctx.arcs().get(0).chapters().size());
+        assertEquals(1, ctx.arcs().get(0).chapters().get(0).scenes().size());
+        assertEquals(1, ctx.arcs().get(0).chapters().get(0).scenes().get(0).branches().size());
     }
 
     // --- BranchHint ---------------------------------------------------------
 
     @Test
     void branchHint_preservesAllFields() {
-        BranchHint b = BranchHint.builder()
-                .label("combat")
-                .targetSceneName("La confrontation")
-                .condition("initiative > 15")
-                .build();
+        BranchHint b = new BranchHint("combat", "La confrontation", "initiative > 15");
 
-        assertEquals("combat", b.getLabel());
-        assertEquals("La confrontation", b.getTargetSceneName());
-        assertEquals("initiative > 15", b.getCondition());
+        assertEquals("combat", b.label());
+        assertEquals("La confrontation", b.targetSceneName());
+        assertEquals("initiative > 15", b.condition());
     }
 
     @Test
     void branchHint_conditionIsOptional() {
-        BranchHint b = BranchHint.builder()
-                .label("suite normale")
-                .targetSceneName("Scene 2")
-                .build();
+        BranchHint b = new BranchHint("suite normale", "Scene 2", null);
 
-        assertNull(b.getCondition());
+        assertNull(b.condition());
     }
 
     // --- illustrationCount --------------------------------------------------
 
     @Test
     void illustrationCount_defaultsToZero_onAllSummaryTypes() {
-        ArcSummary arc = ArcSummary.builder().name("X").build();
-        ChapterSummary chapter = ChapterSummary.builder().name("X").build();
-        SceneSummary scene = SceneSummary.builder().name("X").build();
+        ArcSummary arc = new ArcSummary("X", null, 0, List.of());
+        ChapterSummary chapter = new ChapterSummary("X", null, 0, List.of());
+        SceneSummary scene = new SceneSummary("X", null, 0, List.of());
 
-        assertEquals(0, arc.getIllustrationCount());
-        assertEquals(0, chapter.getIllustrationCount());
-        assertEquals(0, scene.getIllustrationCount());
+        assertEquals(0, arc.illustrationCount());
+        assertEquals(0, chapter.illustrationCount());
+        assertEquals(0, scene.illustrationCount());
     }
 
-    // --- @Singular : accumulation incrementale -----------------------------
+    // --- Construction incrementale (chapitres multiples) -------------------
 
     @Test
-    void singular_accumulatesMultipleCalls() {
-        ArcSummary arc = ArcSummary.builder()
-                .name("Acte I")
-                .chapter(ChapterSummary.builder().name("Ch1").build())
-                .chapter(ChapterSummary.builder().name("Ch2").build())
-                .chapter(ChapterSummary.builder().name("Ch3").build())
-                .build();
+    void multipleChapters_arePreserved() {
+        ArcSummary arc = new ArcSummary(
+                "Acte I",
+                null,
+                0,
+                List.of(
+                        new ChapterSummary("Ch1", null, 0, List.of()),
+                        new ChapterSummary("Ch2", null, 0, List.of()),
+                        new ChapterSummary("Ch3", null, 0, List.of())));
 
-        assertEquals(3, arc.getChapters().size());
-        assertTrue(arc.getChapters().stream().anyMatch(c -> "Ch2".equals(c.getName())));
+        assertEquals(3, arc.chapters().size());
+        assertEquals("Ch2", arc.chapters().get(1).name());
     }
 }

core/src/test/java/com/loremind/domain/generationcontext/ChatRequestTest.java

@@ -3,6 +3,7 @@ package com.loremind.domain.generationcontext;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
+import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -26,57 +27,45 @@ class ChatRequestTest {
     void buildLoreOnly_leavesCampaignAndEntityNull() {
         ChatRequest request = ChatRequest.builder()
                 .messages(sampleMessages)
-                .loreContext(LoreStructuralContext.builder()
-                        .loreName("Ithoril")
-                        .loreDescription("Royaume sombre")
-                        .folders(java.util.Map.of())
-                        .build())
+                .loreContext(new LoreStructuralContext("Ithoril", "Royaume sombre", Map.of(), List.of()))
                 .build();
 
-        assertEquals(1, request.getMessages().size());
-        assertNotNull(request.getLoreContext());
-        assertEquals("Ithoril", request.getLoreContext().getLoreName());
-        assertNull(request.getPageContext());
-        assertNull(request.getCampaignContext());
-        assertNull(request.getNarrativeEntity());
+        assertEquals(1, request.messages().size());
+        assertNotNull(request.loreContext());
+        assertEquals("Ithoril", request.loreContext().loreName());
+        assertNull(request.pageContext());
+        assertNull(request.campaignContext());
+        assertNull(request.narrativeEntity());
     }
 
     @Test
     void buildLoreWithPageFocus_hasBothContexts() {
         ChatRequest request = ChatRequest.builder()
                 .messages(sampleMessages)
-                .loreContext(LoreStructuralContext.builder().folders(java.util.Map.of()).build())
-                .pageContext(PageContext.builder()
-                        .title("Thorin")
-                        .templateName("PNJ")
-                        .build())
+                .loreContext(new LoreStructuralContext(null, null, Map.of(), List.of()))
+                .pageContext(new PageContext("Thorin", "PNJ", null, null))
                 .build();
 
-        assertNotNull(request.getLoreContext());
-        assertNotNull(request.getPageContext());
-        assertEquals("Thorin", request.getPageContext().getTitle());
+        assertNotNull(request.loreContext());
+        assertNotNull(request.pageContext());
+        assertEquals("Thorin", request.pageContext().title());
     }
 
     @Test
     void buildCampaignWithNarrativeEntity_hasBothContexts() {
         ChatRequest request = ChatRequest.builder()
                 .messages(sampleMessages)
-                .campaignContext(CampaignStructuralContext.builder()
-                        .campaignName("Les Ombres")
-                        .campaignDescription("...")
-                        .build())
-                .narrativeEntity(NarrativeEntityContext.builder()
-                        .entityType("scene")
-                        .title("L'auberge")
-                        .fields(java.util.Map.of("location", "Taverne"))
-                        .build())
+                .campaignContext(new CampaignStructuralContext(
+                        "Les Ombres", "...", List.of(), List.of()))
+                .narrativeEntity(new NarrativeEntityContext(
+                        "scene", "L'auberge", Map.of("location", "Taverne")))
                 .build();
 
-        assertNotNull(request.getCampaignContext());
-        assertNotNull(request.getNarrativeEntity());
-        assertEquals("scene", request.getNarrativeEntity().getEntityType());
-        assertNull(request.getLoreContext());
-        assertNull(request.getPageContext());
+        assertNotNull(request.campaignContext());
+        assertNotNull(request.narrativeEntity());
+        assertEquals("scene", request.narrativeEntity().entityType());
+        assertNull(request.loreContext());
+        assertNull(request.pageContext());
     }
 
     @Test
@@ -86,10 +75,10 @@ class ChatRequestTest {
                 .messages(sampleMessages)
                 .build();
 
-        assertEquals(1, request.getMessages().size());
-        assertNull(request.getLoreContext());
-        assertNull(request.getPageContext());
-        assertNull(request.getCampaignContext());
-        assertNull(request.getNarrativeEntity());
+        assertEquals(1, request.messages().size());
+        assertNull(request.loreContext());
+        assertNull(request.pageContext());
+        assertNull(request.campaignContext());
+        assertNull(request.narrativeEntity());
     }
 }

core/src/test/java/com/loremind/domain/generationcontext/GenerationContextTest.java

@@ -9,41 +9,38 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 /**
  * Tests unitaires pour GenerationContext (Value Object pour la generation one-shot).
- * Verifie la construction via builder et l'egalite structurelle.
+ * Verifie la construction et l'egalite structurelle (record).
  */
 class GenerationContextTest {
 
     @Test
-    void builder_preservesAllFields() {
-        GenerationContext ctx = GenerationContext.builder()
-                .loreName("Ithoril")
-                .loreDescription("Royaume sombre")
-                .folderName("PNJ")
-                .templateName("Fiche PNJ")
-                .templateFields(List.of("histoire", "motto", "apparence"))
-                .pageTitle("Thorin")
-                .build();
+    void constructor_preservesAllFields() {
+        GenerationContext ctx = new GenerationContext(
+                "Ithoril",
+                "Royaume sombre",
+                "PNJ",
+                "Fiche PNJ",
+                List.of("histoire", "motto", "apparence"),
+                "Thorin");
 
-        assertEquals("Ithoril", ctx.getLoreName());
-        assertEquals("PNJ", ctx.getFolderName());
-        assertEquals("Fiche PNJ", ctx.getTemplateName());
-        assertEquals(3, ctx.getTemplateFields().size());
-        assertEquals("Thorin", ctx.getPageTitle());
+        assertEquals("Ithoril", ctx.loreName());
+        assertEquals("PNJ", ctx.folderName());
+        assertEquals("Fiche PNJ", ctx.templateName());
+        assertEquals(3, ctx.templateFields().size());
+        assertEquals("Thorin", ctx.pageTitle());
     }
 
     @Test
     void twoContexts_withSameFields_areEqual() {
-        GenerationContext a = GenerationContext.builder()
-                .loreName("X").pageTitle("A").templateFields(List.of("f1")).build();
-        GenerationContext b = GenerationContext.builder()
-                .loreName("X").pageTitle("A").templateFields(List.of("f1")).build();
+        GenerationContext a = new GenerationContext("X", null, null, null, List.of("f1"), "A");
+        GenerationContext b = new GenerationContext("X", null, null, null, List.of("f1"), "A");
         assertEquals(a, b);
     }
 
     @Test
     void twoContexts_differingOnPageTitle_areNotEqual() {
-        GenerationContext a = GenerationContext.builder().pageTitle("A").build();
-        GenerationContext b = GenerationContext.builder().pageTitle("B").build();
+        GenerationContext a = new GenerationContext(null, null, null, null, null, "A");
+        GenerationContext b = new GenerationContext(null, null, null, null, null, "B");
         assertNotEquals(a, b);
     }
 }

core/src/test/java/com/loremind/domain/generationcontext/LoreStructuralContextTest.java

@@ -12,66 +12,61 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tests unitaires pour LoreStructuralContext et son type imbrique PageSummary.
- * Valide le @Singular de Lombok sur {@code tags} (alimentation incrementale via
- * {@code tag(...)} vs initialisation groupee via {@code tags(...)}).
+ * Records purs : aucune dependance technique.
  */
 class LoreStructuralContextTest {
 
     @Test
-    void builder_preservesFoldersAndTags() {
-        PageSummary pnj = PageSummary.builder()
-                .title("Thorin")
-                .templateName("PNJ")
-                .values(Map.of("histoire", "Nee sous une etoile rouge"))
-                .tags(List.of("pnj", "allie"))
-                .relatedPageTitles(List.of("Taverne du Dragon d'Or"))
-                .build();
+    void constructor_preservesFoldersAndTags() {
+        PageSummary pnj = new PageSummary(
+                "Thorin",
+                "PNJ",
+                Map.of("histoire", "Nee sous une etoile rouge"),
+                List.of("pnj", "allie"),
+                List.of("Taverne du Dragon d'Or"));
 
-        LoreStructuralContext ctx = LoreStructuralContext.builder()
-                .loreName("Ithoril")
-                .loreDescription("Royaume sombre")
-                .folders(Map.of("PNJ", List.of(pnj)))
-                .tag("royaume")
-                .tag("dark-fantasy")
-                .build();
+        LoreStructuralContext ctx = new LoreStructuralContext(
+                "Ithoril",
+                "Royaume sombre",
+                Map.of("PNJ", List.of(pnj)),
+                List.of("royaume", "dark-fantasy"));
 
-        assertEquals("Ithoril", ctx.getLoreName());
-        assertEquals(1, ctx.getFolders().size());
-        assertEquals(1, ctx.getFolders().get("PNJ").size());
-        assertEquals(2, ctx.getTags().size(), "@Singular doit accumuler les appels tag()");
-        assertTrue(ctx.getTags().contains("royaume"));
-        assertTrue(ctx.getTags().contains("dark-fantasy"));
+        assertEquals("Ithoril", ctx.loreName());
+        assertEquals(1, ctx.folders().size());
+        assertEquals(1, ctx.folders().get("PNJ").size());
+        assertEquals(2, ctx.tags().size());
+        assertTrue(ctx.tags().contains("royaume"));
+        assertTrue(ctx.tags().contains("dark-fantasy"));
     }
 
     @Test
     void emptyFolders_areAllowed() {
         // Dossier vide : legitime (ex: dossier "Lieux" cree mais pas encore peuple).
-        LoreStructuralContext ctx = LoreStructuralContext.builder()
-                .loreName("Vide")
-                .loreDescription("")
-                .folders(Map.of("Lieux", List.of()))
-                .build();
+        LoreStructuralContext ctx = new LoreStructuralContext(
+                "Vide",
+                "",
+                Map.of("Lieux", List.of()),
+                List.of());
 
-        assertNotNull(ctx.getFolders().get("Lieux"));
-        assertTrue(ctx.getFolders().get("Lieux").isEmpty());
+        assertNotNull(ctx.folders().get("Lieux"));
+        assertTrue(ctx.folders().get("Lieux").isEmpty());
     }
 
     // --- PageSummary --------------------------------------------------------
 
     @Test
     void pageSummary_preservesAllFields() {
-        PageSummary ps = PageSummary.builder()
-                .title("Le Donjon du Chaos")
-                .templateName("Lieu")
-                .values(Map.of("histoire", "Bati il y a 1000 ans..."))
-                .tags(List.of("donjon", "ancien"))
-                .relatedPageTitles(List.of("Thorin", "Garde royale"))
-                .build();
+        PageSummary ps = new PageSummary(
+                "Le Donjon du Chaos",
+                "Lieu",
+                Map.of("histoire", "Bati il y a 1000 ans..."),
+                List.of("donjon", "ancien"),
+                List.of("Thorin", "Garde royale"));
 
-        assertEquals("Le Donjon du Chaos", ps.getTitle());
-        assertEquals("Lieu", ps.getTemplateName());
-        assertEquals(1, ps.getValues().size());
-        assertEquals(2, ps.getTags().size());
-        assertEquals(2, ps.getRelatedPageTitles().size());
+        assertEquals("Le Donjon du Chaos", ps.title());
+        assertEquals("Lieu", ps.templateName());
+        assertEquals(1, ps.values().size());
+        assertEquals(2, ps.tags().size());
+        assertEquals(2, ps.relatedPageTitles().size());
     }
 }

core/src/test/java/com/loremind/domain/generationcontext/NarrativeEntityContextTest.java

@@ -16,21 +16,17 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals;
 class NarrativeEntityContextTest {
 
     @Test
-    void builder_preservesAllFields() {
+    void constructor_preservesAllFields() {
         Map<String, String> fields = new LinkedHashMap<>();
         fields.put("themes", "trahison");
         fields.put("stakes", "la survie du royaume");
 
-        NarrativeEntityContext ctx = NarrativeEntityContext.builder()
-                .entityType("arc")
-                .title("Acte I")
-                .fields(fields)
-                .build();
+        NarrativeEntityContext ctx = new NarrativeEntityContext("arc", "Acte I", fields);
 
-        assertEquals("arc", ctx.getEntityType());
-        assertEquals("Acte I", ctx.getTitle());
-        assertEquals(2, ctx.getFields().size());
-        assertEquals("trahison", ctx.getFields().get("themes"));
+        assertEquals("arc", ctx.entityType());
+        assertEquals("Acte I", ctx.title());
+        assertEquals(2, ctx.fields().size());
+        assertEquals("trahison", ctx.fields().get("themes"));
     }
 
     @Test
@@ -41,19 +37,15 @@ class NarrativeEntityContextTest {
         fields.put("timing", "Soir");
         fields.put("atmosphere", "fumee");
 
-        NarrativeEntityContext ctx = NarrativeEntityContext.builder()
-                .entityType("scene")
-                .title("L'auberge")
-                .fields(fields)
-                .build();
+        NarrativeEntityContext ctx = new NarrativeEntityContext("scene", "L'auberge", fields);
 
-        assertEquals("[location, timing, atmosphere]", ctx.getFields().keySet().toString());
+        assertEquals("[location, timing, atmosphere]", ctx.fields().keySet().toString());
     }
 
     @Test
     void twoContexts_differingOnEntityType_areNotEqual() {
-        NarrativeEntityContext a = NarrativeEntityContext.builder().entityType("arc").title("X").build();
-        NarrativeEntityContext b = NarrativeEntityContext.builder().entityType("scene").title("X").build();
+        NarrativeEntityContext a = new NarrativeEntityContext("arc", "X", Map.of());
+        NarrativeEntityContext b = new NarrativeEntityContext("scene", "X", Map.of());
         assertNotEquals(a, b);
     }
 }

core/src/test/java/com/loremind/domain/generationcontext/PageContextTest.java

@@ -14,31 +14,29 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 class PageContextTest {
 
     @Test
-    void builder_preservesAllFields() {
-        PageContext ctx = PageContext.builder()
-                .title("Thorin")
-                .templateName("PNJ")
-                .templateFields(List.of("histoire", "apparence", "motto"))
-                .values(Map.of("histoire", "Nee sous une etoile rouge"))
-                .build();
+    void constructor_preservesAllFields() {
+        PageContext ctx = new PageContext(
+                "Thorin",
+                "PNJ",
+                List.of("histoire", "apparence", "motto"),
+                Map.of("histoire", "Nee sous une etoile rouge"));
 
-        assertEquals("Thorin", ctx.getTitle());
-        assertEquals("PNJ", ctx.getTemplateName());
-        assertEquals(3, ctx.getTemplateFields().size());
-        assertEquals(1, ctx.getValues().size());
+        assertEquals("Thorin", ctx.title());
+        assertEquals("PNJ", ctx.templateName());
+        assertEquals(3, ctx.templateFields().size());
+        assertEquals(1, ctx.values().size());
     }
 
     @Test
     void emptyValues_areAllowed() {
         // Page vierge : template defini mais aucun champ rempli (cas generation ex-nihilo).
-        PageContext ctx = PageContext.builder()
-                .title("Nouveau PNJ")
-                .templateName("PNJ")
-                .templateFields(List.of("histoire", "apparence"))
-                .values(Map.of())
-                .build();
+        PageContext ctx = new PageContext(
+                "Nouveau PNJ",
+                "PNJ",
+                List.of("histoire", "apparence"),
+                Map.of());
 
-        assertTrue(ctx.getValues().isEmpty());
-        assertEquals(2, ctx.getTemplateFields().size());
+        assertTrue(ctx.values().isEmpty());
+        assertEquals(2, ctx.templateFields().size());
     }
 }

core/src/test/java/com/loremind/infrastructure/ai/BrainChatPayloadBuilderTest.java

@@ -83,12 +83,8 @@ class BrainChatPayloadBuilderTest {
     @Test
     @SuppressWarnings("unchecked")
     void build_loreContext_includesBasicFields() {
-        LoreStructuralContext lore = LoreStructuralContext.builder()
-                .loreName("Ithoril")
-                .loreDescription("Royaume sombre")
-                .folders(Map.of())
-                .tag("dark-fantasy")
-                .build();
+        LoreStructuralContext lore = new LoreStructuralContext(
+                "Ithoril", "Royaume sombre", Map.of(), List.of("dark-fantasy"));
         ChatRequest req = ChatRequest.builder().messages(sampleMessages).loreContext(lore).build();
 
         Map<String, Object> payload = builder.build(req);
@@ -103,17 +99,10 @@ class BrainChatPayloadBuilderTest {
     @Test
     @SuppressWarnings("unchecked")
     void build_pageSummary_omitsEmptyValuesTagsAndRelated() {
-        PageSummary minimal = PageSummary.builder()
-                .title("Thorin")
-                .templateName("PNJ")
-                .values(Map.of())
-                .tags(List.of())
-                .relatedPageTitles(List.of())
-                .build();
-        LoreStructuralContext lore = LoreStructuralContext.builder()
-                .loreName("X").loreDescription("")
-                .folders(Map.of("PNJ", List.of(minimal)))
-                .build();
+        PageSummary minimal = new PageSummary("Thorin", "PNJ",
+                Map.of(), List.of(), List.of());
+        LoreStructuralContext lore = new LoreStructuralContext(
+                "X", "", Map.of("PNJ", List.of(minimal)), List.of());
         ChatRequest req = ChatRequest.builder().messages(sampleMessages).loreContext(lore).build();
 
         Map<String, Object> payload = builder.build(req);
@@ -132,17 +121,12 @@ class BrainChatPayloadBuilderTest {
     @Test
     @SuppressWarnings("unchecked")
     void build_pageSummary_includesNonEmptyValuesTagsAndRelated() {
-        PageSummary full = PageSummary.builder()
-                .title("Thorin")
-                .templateName("PNJ")
-                .values(Map.of("histoire", "Nee sous une etoile rouge"))
-                .tags(List.of("pnj", "allie"))
-                .relatedPageTitles(List.of("Taverne du Dragon d'Or"))
-                .build();
-        LoreStructuralContext lore = LoreStructuralContext.builder()
-                .loreName("X").loreDescription("")
-                .folders(Map.of("PNJ", List.of(full)))
-                .build();
+        PageSummary full = new PageSummary("Thorin", "PNJ",
+                Map.of("histoire", "Nee sous une etoile rouge"),
+                List.of("pnj", "allie"),
+                List.of("Taverne du Dragon d'Or"));
+        LoreStructuralContext lore = new LoreStructuralContext(
+                "X", "", Map.of("PNJ", List.of(full)), List.of());
         ChatRequest req = ChatRequest.builder().messages(sampleMessages).loreContext(lore).build();
 
         Map<String, Object> payload = builder.build(req);
@@ -161,12 +145,8 @@ class BrainChatPayloadBuilderTest {
     @Test
     @SuppressWarnings("unchecked")
     void build_pageContext_includesAllFields() {
-        PageContext pc = PageContext.builder()
-                .title("Thorin")
-                .templateName("PNJ")
-                .templateFields(List.of("histoire", "motto"))
-                .values(Map.of("histoire", "..."))
-                .build();
+        PageContext pc = new PageContext("Thorin", "PNJ",
+                List.of("histoire", "motto"), Map.of("histoire", "..."));
         ChatRequest req = ChatRequest.builder().messages(sampleMessages).pageContext(pc).build();
 
         Map<String, Object> payload = builder.build(req);
@@ -182,17 +162,12 @@ class BrainChatPayloadBuilderTest {
     @Test
     @SuppressWarnings("unchecked")
     void build_campaignContext_serializesFullNarrativeTree() {
-        BranchHint branch = BranchHint.builder()
-                .label("fuite").targetSceneName("La poursuite").condition("HP < 50%").build();
-        SceneSummary scene = SceneSummary.builder()
-                .name("L'auberge").description("Rencontre tendue")
-                .illustrationCount(3).branch(branch).build();
-        ChapterSummary chapter = ChapterSummary.builder()
-                .name("L'arrivee").description("...").scene(scene).build();
-        ArcSummary arc = ArcSummary.builder()
-                .name("Acte I").description("Mise en place").illustrationCount(1).chapter(chapter).build();
-        CampaignStructuralContext camp = CampaignStructuralContext.builder()
-                .campaignName("Les Ombres").campaignDescription("dark fantasy").arc(arc).build();
+        BranchHint branch = new BranchHint("fuite", "La poursuite", "HP < 50%");
+        SceneSummary scene = new SceneSummary("L'auberge", "Rencontre tendue", 3, List.of(branch));
+        ChapterSummary chapter = new ChapterSummary("L'arrivee", "...", 0, List.of(scene));
+        ArcSummary arc = new ArcSummary("Acte I", "Mise en place", 1, List.of(chapter));
+        CampaignStructuralContext camp = new CampaignStructuralContext(
+                "Les Ombres", "dark fantasy", List.of(arc), List.of());
         ChatRequest req = ChatRequest.builder().messages(sampleMessages).campaignContext(camp).build();
 
         Map<String, Object> payload = builder.build(req);
@@ -223,9 +198,9 @@ class BrainChatPayloadBuilderTest {
     @Test
     @SuppressWarnings("unchecked")
     void build_arcSummary_omitsIllustrationCount_whenZero() {
-        ArcSummary arc = ArcSummary.builder().name("A").description("").illustrationCount(0).build();
-        CampaignStructuralContext camp = CampaignStructuralContext.builder()
-                .campaignName("X").campaignDescription("").arc(arc).build();
+        ArcSummary arc = new ArcSummary("A", "", 0, List.of());
+        CampaignStructuralContext camp = new CampaignStructuralContext(
+                "X", "", List.of(arc), List.of());
         ChatRequest req = ChatRequest.builder().messages(sampleMessages).campaignContext(camp).build();
 
         Map<String, Object> payload = builder.build(req);
@@ -238,11 +213,11 @@ class BrainChatPayloadBuilderTest {
     @Test
     @SuppressWarnings("unchecked")
     void build_sceneSummary_omitsBranches_whenEmpty() {
-        SceneSummary scene = SceneSummary.builder().name("S").description("").build();
-        ChapterSummary chapter = ChapterSummary.builder().name("Ch").description("").scene(scene).build();
-        ArcSummary arc = ArcSummary.builder().name("A").description("").chapter(chapter).build();
-        CampaignStructuralContext camp = CampaignStructuralContext.builder()
-                .campaignName("X").campaignDescription("").arc(arc).build();
+        SceneSummary scene = new SceneSummary("S", "", 0, List.of());
+        ChapterSummary chapter = new ChapterSummary("Ch", "", 0, List.of(scene));
+        ArcSummary arc = new ArcSummary("A", "", 0, List.of(chapter));
+        CampaignStructuralContext camp = new CampaignStructuralContext(
+                "X", "", List.of(arc), List.of());
         ChatRequest req = ChatRequest.builder().messages(sampleMessages).campaignContext(camp).build();
 
         Map<String, Object> payload = builder.build(req);
@@ -256,12 +231,12 @@ class BrainChatPayloadBuilderTest {
     @Test
     @SuppressWarnings("unchecked")
     void build_branchHint_omitsCondition_whenBlank() {
-        BranchHint branch = BranchHint.builder().label("X").targetSceneName("Y").condition("   ").build();
-        SceneSummary scene = SceneSummary.builder().name("S").description("").branch(branch).build();
-        ChapterSummary chapter = ChapterSummary.builder().name("Ch").description("").scene(scene).build();
-        ArcSummary arc = ArcSummary.builder().name("A").description("").chapter(chapter).build();
-        CampaignStructuralContext camp = CampaignStructuralContext.builder()
-                .campaignName("X").campaignDescription("").arc(arc).build();
+        BranchHint branch = new BranchHint("X", "Y", "   ");
+        SceneSummary scene = new SceneSummary("S", "", 0, List.of(branch));
+        ChapterSummary chapter = new ChapterSummary("Ch", "", 0, List.of(scene));
+        ArcSummary arc = new ArcSummary("A", "", 0, List.of(chapter));
+        CampaignStructuralContext camp = new CampaignStructuralContext(
+                "X", "", List.of(arc), List.of());
         ChatRequest req = ChatRequest.builder().messages(sampleMessages).campaignContext(camp).build();
 
         Map<String, Object> payload = builder.build(req);
@@ -278,10 +253,8 @@ class BrainChatPayloadBuilderTest {
     @Test
     @SuppressWarnings("unchecked")
     void build_narrativeEntity_includesAllFields() {
-        NarrativeEntityContext entity = NarrativeEntityContext.builder()
-                .entityType("scene").title("L'auberge")
-                .fields(Map.of("location", "Taverne", "timing", "Soir"))
-                .build();
+        NarrativeEntityContext entity = new NarrativeEntityContext("scene", "L'auberge",
+                Map.of("location", "Taverne", "timing", "Soir"));
         ChatRequest req = ChatRequest.builder().messages(sampleMessages).narrativeEntity(entity).build();
 
         Map<String, Object> payload = builder.build(req);
@@ -295,10 +268,9 @@ class BrainChatPayloadBuilderTest {
 
     @Test
     void build_campaignScenario_includesBothContextsAndEntity() {
-        CampaignStructuralContext camp = CampaignStructuralContext.builder()
-                .campaignName("X").campaignDescription("").build();
-        NarrativeEntityContext entity = NarrativeEntityContext.builder()
-                .entityType("arc").title("T").fields(Map.of()).build();
+        CampaignStructuralContext camp = new CampaignStructuralContext(
+                "X", "", List.of(), List.of());
+        NarrativeEntityContext entity = new NarrativeEntityContext("arc", "T", Map.of());
         ChatRequest req = ChatRequest.builder()
                 .messages(sampleMessages)
                 .campaignContext(camp)

core/src/test/java/com/loremind/infrastructure/persistence/converter/SceneBranchListJsonConverterTest.java

@@ -48,27 +48,21 @@ class SceneBranchListJsonConverterTest {
 
     @Test
     void roundTrip_preservesAllBranchFields() {
-        // Test critique : depend de @Jacksonized sur SceneBranch.
+        // Test critique : Jackson doit reconstruire SceneBranch (record) via
+        // son constructeur canonique sans aucune annotation.
         List<SceneBranch> source = List.of(
-                SceneBranch.builder()
-                        .label("si les joueurs attaquent")
-                        .targetSceneId("sc-combat")
-                        .condition("initiative > 15")
-                        .build(),
-                SceneBranch.builder()
-                        .label("si les joueurs fuient")
-                        .targetSceneId("sc-poursuite")
-                        .build()
+                new SceneBranch("si les joueurs attaquent", "sc-combat", "initiative > 15"),
+                SceneBranch.of("si les joueurs fuient", "sc-poursuite")
         );
 
         String json = converter.convertToDatabaseColumn(source);
         List<SceneBranch> back = converter.convertToEntityAttribute(json);
 
         assertEquals(2, back.size());
-        assertEquals("si les joueurs attaquent", back.get(0).getLabel());
-        assertEquals("sc-combat", back.get(0).getTargetSceneId());
-        assertEquals("initiative > 15", back.get(0).getCondition());
-        assertEquals("sc-poursuite", back.get(1).getTargetSceneId());
-        assertNull(back.get(1).getCondition(), "condition absente doit rester null apres round-trip");
+        assertEquals("si les joueurs attaquent", back.get(0).label());
+        assertEquals("sc-combat", back.get(0).targetSceneId());
+        assertEquals("initiative > 15", back.get(0).condition());
+        assertEquals("sc-poursuite", back.get(1).targetSceneId());
+        assertNull(back.get(1).condition(), "condition absente doit rester null apres round-trip");
     }
 }

core/src/test/java/com/loremind/infrastructure/persistence/postgres/PostgresSceneRepositoryTest.java

@@ -70,13 +70,13 @@ class PostgresSceneRepositoryTest {
 
     @Test
     void save_scenePreservesBranches_viaJsonbRoundTrip() {
-        // Le critique : le @Jacksonized de SceneBranch doit permettre la
-        // reconstruction via builder apres serialisation Jackson.
+        // Le critique : SceneBranch (record) doit etre reconstructible par
+        // Jackson via le constructeur canonique apres serialisation JSON.
         Scene scene = Scene.builder()
                 .chapterId(chapterId).name("Decision").order(0)
                 .branches(List.of(
-                        SceneBranch.builder().label("fuite").targetSceneId("sc-2").condition("HP bas").build(),
-                        SceneBranch.builder().label("combat").targetSceneId("sc-3").build()
+                        new SceneBranch("fuite", "sc-2", "HP bas"),
+                        SceneBranch.of("combat", "sc-3")
                 ))
                 .build();
 
@@ -84,10 +84,10 @@ class PostgresSceneRepositoryTest {
         Scene r = repository.findById(saved.getId()).orElseThrow();
 
         assertEquals(2, r.getBranches().size());
-        assertEquals("fuite", r.getBranches().get(0).getLabel());
-        assertEquals("sc-2", r.getBranches().get(0).getTargetSceneId());
-        assertEquals("HP bas", r.getBranches().get(0).getCondition());
-        assertEquals("combat", r.getBranches().get(1).getLabel());
+        assertEquals("fuite", r.getBranches().get(0).label());
+        assertEquals("sc-2", r.getBranches().get(0).targetSceneId());
+        assertEquals("HP bas", r.getBranches().get(0).condition());
+        assertEquals("combat", r.getBranches().get(1).label());
     }
 
     @Test