Reorder shared D&D extraction prompt messages

internal/modules/dnd/extract/combatturns/assets/prompts/dnd.combat_turns.yaml

@@ -20,6 +20,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:
@@ -28,8 +34,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: ./task.md
   - role: user

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

@@ -1,12 +1,5 @@
-Return exactly one JSON object and no explanatory text.
-
 Return the combat_turns array even when no combat turn is established. Return
 one or more actions for every turn. Use one of the supported turn_kind and
-action category values. Set round to null when the transcript does not state
-an explicit or unambiguous positive round number. Set resolution to null when
-the transcript establishes the declaration but not an immediate resolution.
-
-Every source reference must contain start_unit_id and end_unit_id from the
-provided transcript. Do not add source_id; the extraction mapper assigns the
-current source identity. Do not include fields not defined by the response
-schema.
+action category values. Set round to null when the transcript does not state an
+explicit or unambiguous positive round number. Set resolution to null when the
+transcript establishes the declaration but not an immediate resolution.

internal/modules/dnd/extract/combatturns/assets/prompts/task.md

@@ -5,26 +5,15 @@ participant takes a combat turn or performs a discrete interrupting combat
 event. Reactions, legendary actions, lair actions, and other out-of-turn events
 belong at the point where they occur in transcript chronology.
 
-Report only the declaration and its immediate observed resolution. Immediate
-resolution may include directly associated rolls, damage, healing, movement,
-conditions, target outcomes, or an interruption. Do not follow consequences
-that occur on later turns or elsewhere in the scene.
-
 Exclude initiative setup without a turn or combat event, tactical planning,
 table talk, rules lookup, hypothetical actions, abandoned declarations, recap
 of combat outside the current passage, and downstream consequences.
 
-Use only the supplied transcript as evidence. Do not infer a round, target,
-roll, amount, condition, outcome, or action classification from D&D rules
-knowledge. Preserve the session as played; attribute relevant nonstandard
-rulings to the GM or table.
+Do not infer a round, target, roll, amount, condition, outcome, or action
+classification from D&D rules knowledge. Preserve the session as played;
+attribute relevant nonstandard rulings to the GM or table.
 
-The actor must be the in-world character or creature, not a player, transcript
-speaker, or GM. Use player, party, glossary, and NPC reference material only
-to disambiguate identities. Reference material is context, never combat
-evidence. Unmatched actors and targets remain permitted.
+Unmatched actors and targets remain permitted.
 
 For every factual detail in a turn, cite all supporting transcript units in the
-turn-level source_refs collection. Use narrow ranges when evidence is
-non-contiguous. Numeric source-unit IDs identify transcript units; they do not
-establish chronology outside the supplied transcript.
+turn-level source_refs collection.

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

@@ -20,8 +20,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",
 	},
 }