Make combat scene validation more reliable

internal/modules/integration/dnd_npc_grounded_test.go

@@ -276,7 +276,7 @@ func TestSceneCombatSemanticsCorrectionRetriesAndRevalidates(t *testing.T) {
 	profile.Steps[0].Artifacts["scene-descriptions"] = sceneLane
 	configValue.Pipelines["dnd-npc-grounded"] = profile
 
-	client := &groundedDNDLLMClient{sceneKinds: []dnd.SceneKind{dnd.SceneKindNarrative, dnd.SceneKindCombat}, combatSemanticsVerdicts: []string{"combat_should_be_added", "approved"}}
+	client := &groundedDNDLLMClient{sceneKinds: []dnd.SceneKind{dnd.SceneKindNarrative, dnd.SceneKindCombat}, combatSemanticsClassifications: []string{"combat", "combat"}}
 	output := runGroundedPipeline(t, configValue, registries, client, nil)
 	if len(output.Rejected) != 0 {
 		t.Fatalf("rejected = %#v, want corrected acceptance", output.Rejected)
@@ -573,16 +573,16 @@ func (loader *generatedReferenceCheckpointLoader) extractDependencies(laneID str
 }
 
 type groundedDNDLLMClient struct {
-	mu                      sync.Mutex
-	requests                []contracts.StructuredCompletionRequest
-	sceneKind               dnd.SceneKind
-	sceneTitle              string
-	firstUnitID             int
-	thirdUnitID             int
-	sceneKinds              []dnd.SceneKind
-	combatSemanticsVerdicts []string
-	sceneCalls              int
-	combatSemanticsCalls    int
+	mu                             sync.Mutex
+	requests                       []contracts.StructuredCompletionRequest
+	sceneKind                      dnd.SceneKind
+	sceneTitle                     string
+	firstUnitID                    int
+	thirdUnitID                    int
+	sceneKinds                     []dnd.SceneKind
+	combatSemanticsClassifications []string
+	sceneCalls                     int
+	combatSemanticsCalls           int
 }
 
 func (client *groundedDNDLLMClient) CompleteStructured(ctx context.Context, request contracts.StructuredCompletionRequest, out any) (contracts.StructuredCompletionResponse, error) {
@@ -629,12 +629,12 @@ func (client *groundedDNDLLMClient) CompleteStructured(ctx context.Context, requ
 		}
 		payload = map[string]any{"kind": kind, "title": title, "summary": "The party faces an active encounter."}
 	case combatsemantics.PromptID:
-		verdict := "approved"
-		if client.combatSemanticsCalls < len(client.combatSemanticsVerdicts) {
-			verdict = client.combatSemanticsVerdicts[client.combatSemanticsCalls]
+		classification := "combat"
+		if client.combatSemanticsCalls < len(client.combatSemanticsClassifications) {
+			classification = client.combatSemanticsClassifications[client.combatSemanticsCalls]
 		}
 		client.combatSemanticsCalls++
-		payload = map[string]any{"verdict": verdict, "explanation": "The transcript shows an active encounter with hostile action."}
+		payload = map[string]any{"classification": classification, "explanation": "The transcript shows an active encounter with hostile action."}
 	case spells.PromptID:
 		payload = map[string]any{"spell_casts": []any{map[string]any{
 			"caster": "Mira Thorn", "spell": "Cure Wounds",