Consolidate scene and normalization prompt instructions

internal/modules/dnd/normalize/locations/prompt_assets.go

@@ -17,7 +17,7 @@ var promptAssetManifest = shared.PromptAssetManifest{
 	ModuleDir: PromptID,
 	ModuleFiles: []promptfs.ModulePromptFile{
 		{Name: "prompt.yaml", Path: "prompts/prompt.yaml"},
-		{Name: "task.md", Path: "prompts/task.md"},
+		{Name: "instructions.md", Path: "prompts/instructions.md"},
 		{Name: "candidates.md", Path: "prompts/candidates.md"},
 	},
 	SharedFiles: []string{"common-dnd-system.md", "common-dnd-entity-reconciliation.md", "common-dnd-transcript-windows.md"},

internal/modules/dnd/normalize/locations/prompt_assets_test.go

@@ -12,6 +12,18 @@ import (
 )
 
 func TestRegisterPromptAssetsPreparesLocationNormalizationPrompt(t *testing.T) {
+	hasInstructions := false
+	for _, file := range promptAssetManifest.ModuleFiles {
+		if file.Name == "task.md" {
+			t.Fatalf("module prompt files = %#v, want no retired task asset", promptAssetManifest.ModuleFiles)
+		}
+		if file.Name == "instructions.md" {
+			hasInstructions = true
+		}
+	}
+	if !hasInstructions {
+		t.Fatalf("module prompt files = %#v, want instructions asset", promptAssetManifest.ModuleFiles)
+	}
 	registry := llm.NewAssetRegistry()
 	if err := entityreconcile.RegisterSchemaAssets(registry); err != nil {
 		t.Fatal(err)
@@ -32,15 +44,26 @@ func TestRegisterPromptAssetsPreparesLocationNormalizationPrompt(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if prepared.OutputContract.SchemaPath != "dnd_entity_reconcile_llm.v1.json" || len(prepared.Messages) != 5 {
+	if prepared.OutputContract.SchemaPath != "dnd_entity_reconcile_llm.v1.json" || len(prepared.Messages) < 5 {
 		t.Fatalf("prepared prompt = %#v", prepared)
 	}
 	for _, index := range []int{2, 4} {
-		if prepared.Messages[index].CacheControl == nil {
+		if prepared.Messages[index].CacheControl == nil || prepared.Messages[index].CacheControl.Type != promptkit.CacheControlEphemeral {
 			t.Fatalf("message %d cache = %#v", index, prepared.Messages[index].CacheControl)
 		}
 	}
 	if !strings.Contains(prepared.Messages[3].Content, "candidate-000001") || strings.Contains(prepared.Messages[3].Content, `"windows"`) {
 		t.Fatalf("candidate message = %q", prepared.Messages[3].Content)
 	}
+	if !strings.Contains(prepared.Messages[4].Content, `"windows"`) || strings.Contains(prepared.Messages[4].Content, "candidate-000001") {
+		t.Fatalf("transcript message = %q", prepared.Messages[4].Content)
+	}
+	for index, message := range prepared.Messages {
+		if index != 3 && strings.Contains(message.Content, "candidate-000001") {
+			t.Errorf("message %d unexpectedly rendered candidate input", index)
+		}
+		if index != 4 && strings.Contains(message.Content, `"windows"`) {
+			t.Errorf("message %d unexpectedly rendered transcript input", index)
+		}
+	}
 }

internal/modules/dnd/normalize/npcs/prompt_assets.go

@@ -17,7 +17,7 @@ var promptAssetManifest = shared.PromptAssetManifest{
 	ModuleDir: PromptID,
 	ModuleFiles: []promptfs.ModulePromptFile{
 		{Name: "prompt.yaml", Path: "prompts/prompt.yaml"},
-		{Name: "task.md", Path: "prompts/task.md"},
+		{Name: "instructions.md", Path: "prompts/instructions.md"},
 		{Name: "candidates.md", Path: "prompts/candidates.md"},
 	},
 	SharedFiles: []string{

internal/modules/dnd/normalize/npcs/prompt_assets_test.go

@@ -16,6 +16,18 @@ func TestRegisterPromptAssetsPreparesNormalizationPrompt(t *testing.T) {
 	if want := []string{"common-dnd-system.md", "common-dnd-entity-reconciliation.md", "common-dnd-transcript-windows.md"}; !reflect.DeepEqual(promptAssetManifest.SharedFiles, want) {
 		t.Fatalf("shared prompt assets = %#v, want %#v", promptAssetManifest.SharedFiles, want)
 	}
+	hasInstructions := false
+	for _, file := range promptAssetManifest.ModuleFiles {
+		if file.Name == "task.md" {
+			t.Fatalf("module prompt files = %#v, want no retired task asset", promptAssetManifest.ModuleFiles)
+		}
+		if file.Name == "instructions.md" {
+			hasInstructions = true
+		}
+	}
+	if !hasInstructions {
+		t.Fatalf("module prompt files = %#v, want instructions asset", promptAssetManifest.ModuleFiles)
+	}
 	if promptHash, err := promptAssetMetadata(); err != nil || promptHash == "" {
 		t.Fatalf("promptAssetMetadata() = %q, %v; want prompt fingerprint", promptHash, err)
 	}
@@ -50,13 +62,11 @@ func TestRegisterPromptAssetsPreparesNormalizationPrompt(t *testing.T) {
 	if prepared.PromptID != PromptID || prepared.OutputContract.SchemaPath != "dnd_entity_reconcile_llm.v1.json" {
 		t.Fatalf("prepared prompt = %#v, want normalization prompt identity and schema", prepared)
 	}
-	if len(prepared.Messages) != 5 {
-		t.Fatalf("prepared messages = %d, want 5", len(prepared.Messages))
+	if len(prepared.Messages) < 5 {
+		t.Fatalf("prepared messages = %#v, want system, instructions, reconciliation policy, candidates, and transcript windows", prepared.Messages)
 	}
-	for index, role := range []string{"system", "user", "user", "user", "user"} {
-		if prepared.Messages[index].Role != role {
-			t.Errorf("message %d role = %q, want %q", index, prepared.Messages[index].Role, role)
-		}
+	if prepared.Messages[0].Role != "system" {
+		t.Fatalf("initial message role = %q, want system", prepared.Messages[0].Role)
 	}
 	for _, index := range []int{2, 4} {
 		if cache := prepared.Messages[index].CacheControl; cache == nil || cache.Type != promptkit.CacheControlEphemeral {