Reorder shared D&D extraction prompt messages

internal/modules/dnd/extract/spells/assets/prompts/dnd.spells.yaml

@@ -23,6 +23,12 @@ inputs:
 messages:
   - role: system
     content_file: ./sharedassets/common-dnd-system.md
+  - role: user
+    content_file: ./sharedassets/common-dnd-extraction-evidence.md
+  - role: user
+    content_file: ./sharedassets/common-dnd-identity.md
+    cache_control:
+      type: ephemeral
   - role: user
     content_file: ./sharedassets/common-dnd-transcript.md
     cache_control:
@@ -31,8 +37,12 @@ messages:
     content_file: ./sharedassets/common-dnd-references.md
     cache_control:
       type: ephemeral
+  - role: user
+    content_file: ./sharedassets/common-dnd-immediate-resolution.md
   - role: user
     content_file: ./sharedassets/common-dnd-npcs.md
+    cache_control:
+      type: ephemeral
   - role: user
     content_file: ./catalog.md
   - role: user

internal/modules/dnd/extract/spells/assets/prompts/instructions.md

@@ -1,40 +1,29 @@
-Source references must use integer source-unit IDs from the transcript. Provide
-start_unit_id and end_unit_id for each source reference; the extractor assigns
-source_id automatically.
+For each spell cast, source references must collectively support the caster,
+spell, effect, and narrative_description. If a detail is not supported by the
+cited transcript units, omit that detail or describe only the supported attempt
+or declaration.
 
-Report only the casting declaration or action and its immediate resolution.
-This may include an immediately resolved target, saving throw, damage, healing,
-condition, interruption, or outcome. Do not follow summoned creatures,
-persistent effects, or other downstream consequences through the rest of the
-scene.
+For spells, do not follow summoned creatures, persistent effects, or other
+downstream consequences through the rest of the scene.
 
-For every detail you report, cite all supporting transcript units. The source
-references for an artifact must collectively support every factual claim in
-caster, spell, effect, and narrative_description. When immediate supporting
-evidence is non-contiguous, provide multiple narrow source references. Do not
-use one broad range merely to bridge unrelated table conversation. If a detail
-is not supported by the cited transcript units, omit that detail or describe
-only the supported attempt or declaration.
+Return only D&D spell-cast artifacts. For each spell cast, identify the
+in-world caster, spell name, effect, narrative description, and source
+references.
 
-Return only D&D spell-cast artifacts. For each spell cast, identify the in-world
-caster, spell name, effect, narrative description, and source references.
-
-The caster must be the canonical in-world character or creature, not the human
-player, transcript speaker, or GM. Use the player and party references together
-with transcript context to map first-person player speech to the associated
-player character and use the canonical character name from the references.
-Likewise, attribute a spell narrated by the GM to the in-world creature that
-casts it. Never return a player or GM name when the associated in-world caster
-can be identified. If the caster cannot be resolved, use only the most specific
-in-world identity supported by the transcript; do not invent a name.
+Use the player and party references together with transcript context to map
+first-person player speech to the associated player character and use the
+canonical character name from the references. Likewise, attribute a spell
+narrated by the GM to the in-world creature that casts it. If the caster cannot
+be resolved, use only the most specific in-world identity supported by the
+transcript; do not invent a name.
 
 Use the canonical spell-name catalog to select spell names. Do not return a
 spell name absent from that catalog, even when it is suggested by general D&D
 knowledge or reference material.
 
-Use player, party, and glossary reference material only to clarify source text;
-references are not source evidence for a spell cast. Do not return spells,
-casters, or effects that are mentioned only in reference material.
+Use player, party, and glossary reference material only to clarify source text.
+Do not return spells, casters, or effects that are mentioned only in reference
+material.
 
 Effects and narrative descriptions are session records, not rules summaries.
 Report only mechanics, explanations, and outcomes established by the cited
@@ -42,5 +31,3 @@ transcript units. Preserve the table's observed resolution without silently
 correcting it from general D&D knowledge. If the transcript gives a possibly
 nonstandard rationale, use wording such as "the GM rules" or "the table
 resolves" rather than asserting that rationale as a universal rule.
-
-Return exactly one JSON object and no explanatory text.

internal/modules/dnd/extract/spells/scriptorium_assets.go

@@ -21,8 +21,11 @@ var promptAssetManifest = shared.PromptAssetManifest{
 	},
 	SharedFiles: []string{
 		"common-dnd-system.md",
+		"common-dnd-extraction-evidence.md",
+		"common-dnd-identity.md",
 		"common-dnd-transcript.md",
 		"common-dnd-references.md",
+		"common-dnd-immediate-resolution.md",
 		"common-dnd-npcs.md",
 	},
 }

internal/modules/dnd/extract/spells/scriptorium_assets_test.go

@@ -46,9 +46,12 @@ func TestScriptoriumPromptPreparesWithMissingOptionalReferences(t *testing.T) {
 	transcript := []byte(`{"id":"session-1","segments":[]}`)
 	prepared := prepareSpellsPrompt(t, transcript, " ", " ", " ")
 
-	if !strings.Contains(prepared.Messages[2].Content, " ") {
-		t.Fatalf("reference message did not include empty optional reference placeholders")
+	for _, message := range prepared.Messages {
+		if strings.Contains(message.Content, "Player list reference:") && strings.Contains(message.Content, "Party roster reference:") && strings.Contains(message.Content, "Glossary reference:") {
+			return
+		}
 	}
+	t.Fatalf("reference message did not render empty optional reference placeholders")
 }
 
 func TestScriptoriumPromptDiagnosticsOmitRawMaterials(t *testing.T) {