Consolidate spell and combat turn instructions

internal/modules/dnd/extract/combatturns/prompt_assets_test.go

@@ -45,15 +45,15 @@ func TestPromptAssetsPrepareRequiredInputs(t *testing.T) {
 	if err != nil {
 		t.Fatalf("NewEngine() error = %v, want nil", err)
 	}
-	transcript := `{"units":[1]}`
+	transcript := `{"units":[{"sentinel":"combat-transcript"}]}`
 	prepared, err := engine.Prepare(context.Background(), promptkit.RunRequest{
 		PromptID: PromptID, PromptVersion: SchemaVersion, ProfileID: "combat-test-profile",
 		Inputs: map[string]promptkit.ArtifactRef{
 			"transcript": promptkit.InlineWithURI("file:///session.json", transcript),
-			"players":    promptkit.Inline(" "),
+			"players":    promptkit.Inline("combat-player"),
 			"party":      promptkit.Inline(" "),
 			"glossary":   promptkit.Inline(" "),
-			"npcs":       promptkit.Inline(" "),
+			"npcs":       promptkit.Inline(`{"npcs":[{"name":"combat-npc"}]}`),
 		},
 	})
 	if err != nil {
@@ -62,4 +62,41 @@ func TestPromptAssetsPrepareRequiredInputs(t *testing.T) {
 	if prepared.PromptID != PromptID || prepared.OutputContract.SchemaPath != "dnd_combat_turns_llm.v1.json" {
 		t.Fatalf("prepared prompt = %#v, want combat prompt identity and schema", prepared)
 	}
+	if len(prepared.Messages) < 6 {
+		t.Fatalf("prepared messages = %#v, want shared context, NPC grounding, and instructions", prepared.Messages)
+	}
+	referenceIndex := -1
+	transcriptIndex := -1
+	npcIndex := -1
+	for index, message := range prepared.Messages {
+		if strings.Contains(message.Content, "combat-player") {
+			referenceIndex = index
+		}
+		if strings.Contains(message.Content, "combat-transcript") {
+			transcriptIndex = index
+		}
+		if strings.Contains(message.Content, "combat-npc") {
+			npcIndex = index
+		}
+	}
+	instructionsIndex := len(prepared.Messages) - 1
+	if referenceIndex < 0 || transcriptIndex <= referenceIndex || npcIndex <= transcriptIndex || instructionsIndex <= npcIndex {
+		t.Fatalf("message order = references %d, transcript %d, NPCs %d, instructions %d; want that order", referenceIndex, transcriptIndex, npcIndex, instructionsIndex)
+	}
+	for _, index := range []int{referenceIndex, transcriptIndex, instructionsIndex} {
+		if cache := prepared.Messages[index].CacheControl; cache == nil || cache.Type != promptkit.CacheControlEphemeral {
+			t.Fatalf("message %d cache control = %#v, want ephemeral", index, cache)
+		}
+	}
+	for index, message := range prepared.Messages {
+		if index != referenceIndex && strings.Contains(message.Content, "combat-player") {
+			t.Errorf("message %d unexpectedly rendered campaign-reference input", index)
+		}
+		if index != transcriptIndex && strings.Contains(message.Content, "combat-transcript") {
+			t.Errorf("message %d unexpectedly rendered transcript input", index)
+		}
+		if index != npcIndex && strings.Contains(message.Content, "combat-npc") {
+			t.Errorf("message %d unexpectedly rendered NPC grounding input", index)
+		}
+	}
 }