Move NPC occurrences to their canonical namespace

internal/modules/dnd/extract/enemyevents/extractor_test.go

@@ -49,8 +49,8 @@ func TestExtractMapsEnemyEventsInSourceOrder(t *testing.T) {
 	if got := string(request.Inputs[CombatTurnReferenceSlot].Content); !strings.Contains(got, `"actor":"Ashfang"`) || strings.Contains(got, "source_ref") {
 		t.Fatalf("combat grounding = %s", got)
 	}
-	if got := string(request.Inputs[NPCInteractionReferenceSlot].Content); !strings.Contains(got, `"kind":"combat_opponent"`) || strings.Contains(got, "Aria") {
-		t.Fatalf("interaction grounding = %s", got)
+	if got := string(request.Inputs[NPCOccurrenceReferenceSlot].Content); !strings.Contains(got, `"kind":"combat_opponent"`) || strings.Contains(got, "Aria") {
+		t.Fatalf("occurrence grounding = %s", got)
 	}
 }
 

internal/modules/dnd/extract/enemyevents/grounding.go

@@ -15,7 +15,7 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd"
 	combatturncodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/combatturns"
-	interactioncodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/npcinteractions"
+	occurrencecodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/npcoccurrences"
 	npccodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/npcregistry"
 	scenecodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/scenedescriptions"
 	npcregistry "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/npcs/registry"
@@ -27,7 +27,7 @@ const (
 	NPCRegistryReferenceSlot      = npcregistry.ReferenceSlot
 	SceneDescriptionReferenceSlot = sceneregistry.ReferenceSlot
 	CombatTurnReferenceSlot       = "combat_turns"
-	NPCInteractionReferenceSlot   = "npc_interactions"
+	NPCOccurrenceReferenceSlot    = "npc_occurrences"
 	ReferenceMaxBytes             = 1048576
 	promptProjectionMediaType     = "application/json"
 )
@@ -67,10 +67,10 @@ func referenceSlots() []contracts.ReferenceSlot {
 			MaxBytes:              ReferenceMaxBytes,
 		},
 		contracts.ReferenceSlot{
-			Name:                  NPCInteractionReferenceSlot,
-			Description:           "Required NPC-interaction artifact used only as source-free enemy-event grounding.",
+			Name:                  NPCOccurrenceReferenceSlot,
+			Description:           "Required NPC-occurrence artifact used only as source-free enemy-event grounding.",
 			Required:              true,
-			AcceptedMediaTypes:    []string{interactioncodec.MediaType},
+			AcceptedMediaTypes:    []string{occurrencecodec.MediaType},
 			AcceptedArtifactKinds: []contracts.ArtifactKind{dnd.NPCOccurrenceListKind},
 			MaxBytes:              ReferenceMaxBytes,
 		},
@@ -86,14 +86,14 @@ type groundingResolver struct {
 	npcs   *npcregistry.Resolver
 	scenes *sceneregistry.Resolver
 
-	combatTurns     *contracts.LLMInputMaterial
-	npcInteractions *contracts.LLMInputMaterial
+	combatTurns    *contracts.LLMInputMaterial
+	npcOccurrences *contracts.LLMInputMaterial
 }
 
 type grounding struct {
-	npcInput            contracts.LLMInputMaterial
-	combatTurnInput     contracts.LLMInputMaterial
-	npcInteractionInput contracts.LLMInputMaterial
+	npcInput           contracts.LLMInputMaterial
+	combatTurnInput    contracts.LLMInputMaterial
+	npcOccurrenceInput contracts.LLMInputMaterial
 }
 
 func newGroundingResolver(references contracts.ReferenceSet) (*groundingResolver, error) {
@@ -109,15 +109,15 @@ func newGroundingResolver(references contracts.ReferenceSet) (*groundingResolver
 	if err != nil {
 		return nil, err
 	}
-	npcInteractions, err := prepareNPCInteractionInput(references)
+	npcOccurrences, err := prepareNPCOccurrenceInput(references)
 	if err != nil {
 		return nil, err
 	}
 	return &groundingResolver{
-		npcs:            npcs,
-		scenes:          scenes,
-		combatTurns:     combatTurns,
-		npcInteractions: npcInteractions,
+		npcs:           npcs,
+		scenes:         scenes,
+		combatTurns:    combatTurns,
+		npcOccurrences: npcOccurrences,
 	}, nil
 }
 
@@ -136,14 +136,14 @@ func (r *groundingResolver) Resolve(references contracts.ReferenceSet) (groundin
 	if err != nil {
 		return grounding{}, err
 	}
-	npcInteractions, err := resolveInput(references, NPCInteractionReferenceSlot, r.npcInteractions, prepareNPCInteractionInput)
+	npcOccurrences, err := resolveInput(references, NPCOccurrenceReferenceSlot, r.npcOccurrences, prepareNPCOccurrenceInput)
 	if err != nil {
 		return grounding{}, err
 	}
 	return grounding{
-		npcInput:            npcs.PromptInput(),
-		combatTurnInput:     combatTurns,
-		npcInteractionInput: npcInteractions,
+		npcInput:           npcs.PromptInput(),
+		combatTurnInput:    combatTurns,
+		npcOccurrenceInput: npcOccurrences,
 	}, nil
 }
 
@@ -188,9 +188,9 @@ func resolveInput(references contracts.ReferenceSet, slot string, seeded *contra
 
 func (g grounding) PromptInputs() contracts.LLMInputSet {
 	return contracts.LLMInputSet{
-		NPCRegistryReferenceSlot:    g.npcInput.Clone(),
-		CombatTurnReferenceSlot:     g.combatTurnInput.Clone(),
-		NPCInteractionReferenceSlot: g.npcInteractionInput.Clone(),
+		NPCRegistryReferenceSlot:   g.npcInput.Clone(),
+		CombatTurnReferenceSlot:    g.combatTurnInput.Clone(),
+		NPCOccurrenceReferenceSlot: g.npcOccurrenceInput.Clone(),
 	}
 }
 
@@ -212,22 +212,22 @@ func prepareCombatTurnInput(references contracts.ReferenceSet) (*contracts.LLMIn
 	return newPromptInput(CombatTurnReferenceSlot, content), nil
 }
 
-func prepareNPCInteractionInput(references contracts.ReferenceSet) (*contracts.LLMInputMaterial, error) {
-	item, ok, err := referenceItem(references, NPCInteractionReferenceSlot, interactioncodec.MediaType)
+func prepareNPCOccurrenceInput(references contracts.ReferenceSet) (*contracts.LLMInputMaterial, error) {
+	item, ok, err := referenceItem(references, NPCOccurrenceReferenceSlot, occurrencecodec.MediaType)
 	if err != nil || !ok {
 		return nil, err
 	}
-	value, err := interactioncodec.New().Decode(item.Content)
+	value, err := occurrencecodec.New().Decode(item.Content)
 	if err != nil {
-		return nil, fmt.Errorf("decode NPC-interaction grounding: invalid approved NPC-interaction JSON")
+		return nil, fmt.Errorf("decode NPC-occurrence grounding: invalid approved NPC-occurrence JSON")
 	}
 	content, err := json.Marshal(struct {
-		Interactions []npcInteractionProjection `json:"npc_interactions"`
-	}{Interactions: projectNPCInteractions(value.Occurrences)})
+		Occurrences []npcOccurrenceProjection `json:"npc_occurrences"`
+	}{Occurrences: projectNPCOccurrences(value.Occurrences)})
 	if err != nil {
-		return nil, fmt.Errorf("encode NPC-interaction grounding: %w", err)
+		return nil, fmt.Errorf("encode NPC-occurrence grounding: %w", err)
 	}
-	return newPromptInput(NPCInteractionReferenceSlot, content), nil
+	return newPromptInput(NPCOccurrenceReferenceSlot, content), nil
 }
 
 func referenceItem(references contracts.ReferenceSet, slotName, expectedMediaType string) (contracts.ReferenceItem, bool, error) {
@@ -271,16 +271,16 @@ func projectCombatTurns(turns []dnd.CombatTurn) []combatTurnProjection {
 	return projection
 }
 
-type npcInteractionProjection struct {
+type npcOccurrenceProjection struct {
 	Name string                `json:"name"`
 	Kind dnd.NPCOccurrenceKind `json:"kind"`
 }
 
-func projectNPCInteractions(occurrences []dnd.NPCOccurrence) []npcInteractionProjection {
-	projection := make([]npcInteractionProjection, 0, len(occurrences))
+func projectNPCOccurrences(occurrences []dnd.NPCOccurrence) []npcOccurrenceProjection {
+	projection := make([]npcOccurrenceProjection, 0, len(occurrences))
 	for _, occurrence := range occurrences {
 		if occurrence.Kind == dnd.NPCOccurrenceKindCombatOpponent {
-			projection = append(projection, npcInteractionProjection{Name: occurrence.Name, Kind: occurrence.Kind})
+			projection = append(projection, npcOccurrenceProjection{Name: occurrence.Name, Kind: occurrence.Kind})
 		}
 	}
 	return projection

internal/modules/dnd/extract/enemyevents/grounding_test.go

@@ -10,7 +10,7 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd"
 	combatturncodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/combatturns"
-	interactioncodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/npcinteractions"
+	occurrencecodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/npcoccurrences"
 	npccodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/npcregistry"
 	scenecodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/scenedescriptions"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/npcs/identity"
@@ -36,7 +36,7 @@ func TestReferenceSlotsDescribeRequiredTypedArtifacts(t *testing.T) {
 		{NPCRegistryReferenceSlot, dnd.NPCRegistryKind},
 		{SceneDescriptionReferenceSlot, dnd.SceneDescriptionListKind},
 		{CombatTurnReferenceSlot, dnd.CombatTurnListKind},
-		{NPCInteractionReferenceSlot, dnd.NPCOccurrenceListKind},
+		{NPCOccurrenceReferenceSlot, dnd.NPCOccurrenceListKind},
 	} {
 		slot, ok := byName[want.name]
 		if !ok || !slot.Required || slot.MaxBytes != ReferenceMaxBytes || len(slot.AcceptedMediaTypes) != 1 || slot.AcceptedMediaTypes[0] != "application/json" || len(slot.AcceptedArtifactKinds) != 1 || slot.AcceptedArtifactKinds[0] != want.kind {
@@ -61,9 +61,9 @@ func TestGroundingProducesExactSourceFreePromptInputs(t *testing.T) {
 	}
 	inputs := resolved.PromptInputs()
 	want := map[string]string{
-		NPCRegistryReferenceSlot:    `{"npcs":[{"name":"Ashfang"}]}`,
-		CombatTurnReferenceSlot:     `{"combat_turns":[{"actor":"Ashfang","turn_kind":"turn"},{"actor":"Aria","turn_kind":"reaction"}]}`,
-		NPCInteractionReferenceSlot: `{"npc_interactions":[{"name":"Ashfang","kind":"combat_opponent"}]}`,
+		NPCRegistryReferenceSlot:   `{"npcs":[{"name":"Ashfang"}]}`,
+		CombatTurnReferenceSlot:    `{"combat_turns":[{"actor":"Ashfang","turn_kind":"turn"},{"actor":"Aria","turn_kind":"reaction"}]}`,
+		NPCOccurrenceReferenceSlot: `{"npc_occurrences":[{"name":"Ashfang","kind":"combat_opponent"}]}`,
 	}
 	if len(inputs) != len(want) {
 		t.Fatalf("PromptInputs() = %#v", inputs)
@@ -153,7 +153,7 @@ func TestGroundingRejectsMissingAndInvalidReferences(t *testing.T) {
 		{NPCRegistryReferenceSlot, "NPC registry"},
 		{SceneDescriptionReferenceSlot, "scene descriptions"},
 		{CombatTurnReferenceSlot, CombatTurnReferenceSlot},
-		{NPCInteractionReferenceSlot, NPCInteractionReferenceSlot},
+		{NPCOccurrenceReferenceSlot, NPCOccurrenceReferenceSlot},
 	} {
 		t.Run("missing "+test.slot, func(t *testing.T) {
 			resolver, err := newGroundingResolver(withoutSlot(valid, test.slot))
@@ -176,7 +176,7 @@ func TestGroundingRejectsMissingAndInvalidReferences(t *testing.T) {
 		set  contracts.ReferenceSet
 	}{
 		{"multiple items", replaceSlot(valid, CombatTurnReferenceSlot, contracts.ResolvedReferenceSlot{Items: []contracts.ReferenceItem{{MediaType: "application/json"}, {MediaType: "application/json"}}})},
-		{"malformed durable content", replaceItem(valid, NPCInteractionReferenceSlot, contracts.ReferenceItem{MediaType: "application/json", Content: []byte(`{}`)})},
+		{"malformed durable content", replaceItem(valid, NPCOccurrenceReferenceSlot, contracts.ReferenceItem{MediaType: "application/json", Content: []byte(`{}`)})},
 		{"wrong media type", replaceItem(valid, CombatTurnReferenceSlot, contracts.ReferenceItem{MediaType: "text/plain", Content: valid.Slots[CombatTurnReferenceSlot].Items[0].Content})},
 		{"oversize", replaceItem(valid, CombatTurnReferenceSlot, contracts.ReferenceItem{MediaType: "application/json", Content: make([]byte, ReferenceMaxBytes+1)})},
 	}
@@ -220,7 +220,7 @@ func groundingReferences(t *testing.T, enemy string, sceneKind dnd.SceneKind) co
 	if err != nil {
 		t.Fatal(err)
 	}
-	interactionContent, err := interactioncodec.New().Encode(dnd.NPCOccurrenceList{Occurrences: []dnd.NPCOccurrence{
+	interactionContent, err := occurrencecodec.New().Encode(dnd.NPCOccurrenceList{Occurrences: []dnd.NPCOccurrence{
 		{NPCID: identity.DeriveID(enemy), Name: enemy, Kind: dnd.NPCOccurrenceKindCombatOpponent, SourceRefs: []source.SourceRef{{SourceID: "combat-session", StartUnitID: 1, EndUnitID: 1}}},
 		{NPCID: identity.DeriveID("Aria"), Name: "Aria", Kind: dnd.NPCOccurrenceKindCombatAlly, SourceRefs: []source.SourceRef{{SourceID: "combat-session", StartUnitID: 2, EndUnitID: 2}}},
 	}})
@@ -231,7 +231,7 @@ func groundingReferences(t *testing.T, enemy string, sceneKind dnd.SceneKind) co
 		NPCRegistryReferenceSlot:      {Items: []contracts.ReferenceItem{newReferenceItem(NPCRegistryReferenceSlot, npcContent)}},
 		SceneDescriptionReferenceSlot: {Items: []contracts.ReferenceItem{newReferenceItem(SceneDescriptionReferenceSlot, sceneContent)}},
 		CombatTurnReferenceSlot:       {Items: []contracts.ReferenceItem{newReferenceItem(CombatTurnReferenceSlot, turnContent)}},
-		NPCInteractionReferenceSlot:   {Items: []contracts.ReferenceItem{newReferenceItem(NPCInteractionReferenceSlot, interactionContent)}},
+		NPCOccurrenceReferenceSlot:    {Items: []contracts.ReferenceItem{newReferenceItem(NPCOccurrenceReferenceSlot, interactionContent)}},
 	}}
 }
 

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

@@ -32,7 +32,7 @@ func TestRegisterPromptAssetsAndPrepareEnemyEventPrompt(t *testing.T) {
 
 func TestEnemyEventPromptRequiresGroundingInputs(t *testing.T) {
 	engine := newEnemyEventPromptEngine(t)
-	for _, inputName := range []string{"npc_registry", "combat_turns", "npc_interactions"} {
+	for _, inputName := range []string{"npc_registry", "combat_turns", "npc_occurrences"} {
 		t.Run(inputName, func(t *testing.T) {
 			inputs := enemyEventPromptInputs()
 			delete(inputs, inputName)
@@ -79,12 +79,12 @@ func newEnemyEventPromptEngine(t *testing.T) *promptkit.Engine {
 
 func enemyEventPromptInputs() map[string]promptkit.ArtifactRef {
 	return map[string]promptkit.ArtifactRef{
-		"transcript":       promptkit.Inline(`{"value":"enemy-transcript"}`),
-		"players":          promptkit.Inline("enemy-player"),
-		"party":            promptkit.Inline("enemy-party"),
-		"glossary":         promptkit.Inline("enemy-glossary"),
-		"npc_registry":     promptkit.Inline(`{"npcs":[{"name":"enemy-npc"}]}`),
-		"combat_turns":     promptkit.Inline(`{"combat_turns":[{"actor":"enemy-turn","turn_kind":"turn"}]}`),
-		"npc_interactions": promptkit.Inline(`{"npc_interactions":[{"name":"enemy-opponent","kind":"combat_opponent"}]}`),
+		"transcript":      promptkit.Inline(`{"value":"enemy-transcript"}`),
+		"players":         promptkit.Inline("enemy-player"),
+		"party":           promptkit.Inline("enemy-party"),
+		"glossary":        promptkit.Inline("enemy-glossary"),
+		"npc_registry":    promptkit.Inline(`{"npcs":[{"name":"enemy-npc"}]}`),
+		"combat_turns":    promptkit.Inline(`{"combat_turns":[{"actor":"enemy-turn","turn_kind":"turn"}]}`),
+		"npc_occurrences": promptkit.Inline(`{"npc_occurrences":[{"name":"enemy-opponent","kind":"combat_opponent"}]}`),
 	}
 }

internal/modules/dnd/extract/npcinteractions/model.go

@@ -1,17 +0,0 @@
-package npcinteractions
-
-type extractionResponse struct {
-	Occurrences []occurrenceResponse `json:"occurrences"`
-}
-
-type occurrenceResponse struct {
-	NPCID      string                         `json:"npc_id"`
-	Name       string                         `json:"name"`
-	Kind       string                         `json:"kind"`
-	SourceRefs []interactionSourceRefResponse `json:"source_refs"`
-}
-
-type interactionSourceRefResponse struct {
-	StartUnitID int `json:"start_unit_id"`
-	EndUnitID   int `json:"end_unit_id"`
-}

internal/modules/dnd/extract/npcoccurrences/canonicalize.go

@@ -1,4 +1,4 @@
-package npcinteractions
+package npcoccurrences
 
 import (
 	"sort"
@@ -66,7 +66,7 @@ func canonicalOccurrenceList(response extractionResponse, sourceID string) dnd.N
 	return dnd.NPCOccurrenceList{Occurrences: occurrences}
 }
 
-func canonicalSourceRefs(refs []interactionSourceRefResponse, sourceID string) []source.SourceRef {
+func canonicalSourceRefs(refs []occurrenceSourceRefResponse, sourceID string) []source.SourceRef {
 	if refs == nil {
 		return nil
 	}
@@ -77,13 +77,13 @@ func canonicalSourceRefs(refs []interactionSourceRefResponse, sourceID string) [
 	return out
 }
 
-func occurrenceResponseRefs(refs []source.SourceRef) []interactionSourceRefResponse {
+func occurrenceResponseRefs(refs []source.SourceRef) []occurrenceSourceRefResponse {
 	if refs == nil {
 		return nil
 	}
-	values := make([]interactionSourceRefResponse, len(refs))
+	values := make([]occurrenceSourceRefResponse, len(refs))
 	for index, ref := range refs {
-		values[index] = interactionSourceRefResponse{StartUnitID: ref.StartUnitID, EndUnitID: ref.EndUnitID}
+		values[index] = occurrenceSourceRefResponse{StartUnitID: ref.StartUnitID, EndUnitID: ref.EndUnitID}
 	}
 	return values
 }

internal/modules/dnd/extract/npcoccurrences/extractor.go

@@ -1,4 +1,4 @@
-package npcinteractions
+package npcoccurrences
 
 import (
 	"context"
@@ -13,8 +13,8 @@ import (
 )
 
 const (
-	Key           = "dnd/npc-interactions"
-	mappingPolicy = "dnd.npc_interactions.extract_mapping.v2"
+	Key           = "dnd/npc-occurrences"
+	mappingPolicy = "dnd.npc_occurrences.extract_mapping.v2"
 )
 
 const (
@@ -28,21 +28,21 @@ var requiredCapabilities = []string{
 }
 
 var providedCapabilities = []string{
-	"dnd.npc_interactions",
+	"dnd.npc_occurrences",
 }
 
 var referenceSlotDescriptions = shared.ReferenceSlotDescriptions{
-	Glossary: "Optional campaign glossary reference material used only for interaction disambiguation.",
-	Party:    "Optional party roster reference material used only for interaction disambiguation.",
-	Players:  "Optional player list reference material used only for interaction disambiguation.",
-	Roster:   "Deprecated alias for party roster reference material used only for interaction disambiguation.",
+	Glossary: "Optional campaign glossary reference material used only for occurrence disambiguation.",
+	Party:    "Optional party roster reference material used only for occurrence disambiguation.",
+	Players:  "Optional player list reference material used only for occurrence disambiguation.",
+	Roster:   "Deprecated alias for party roster reference material used only for occurrence disambiguation.",
 }
 
 func referenceSlots() []contracts.ReferenceSlot {
 	slots := shared.ReferenceSlots(referenceSlotDescriptions)
 	slots = append(slots, contracts.ReferenceSlot{
 		Name:                  NPCRegistryReferenceSlot,
-		Description:           "Required normalized NPC registry used only for interaction identity grounding, never as interaction evidence.",
+		Description:           "Required normalized NPC registry used only for occurrence identity grounding, never as occurrence evidence.",
 		Required:              true,
 		AcceptedMediaTypes:    []string{"application/json"},
 		AcceptedArtifactKinds: []contracts.ArtifactKind{dnd.NPCRegistryKind},
@@ -225,5 +225,5 @@ func DecodeOptions(options map[string]any) (Options, error) {
 }
 
 func extractorErrorf(format string, args ...any) error {
-	return fmt.Errorf("dnd NPC interactions extractor: "+format, args...)
+	return fmt.Errorf("dnd NPC occurrences extractor: "+format, args...)
 }

internal/modules/dnd/extract/npcoccurrences/extractor_test.go

@@ -1,4 +1,4 @@
-package npcinteractions
+package npcoccurrences
 
 import (
 	"context"
@@ -17,14 +17,14 @@ import (
 )
 
 func TestExtractMapsEveryKindAndOrdersBySourcePosition(t *testing.T) {
-	client := &fakeInteractionsLLMClient{response: extractionResponse{Occurrences: []occurrenceResponse{
-		{NPCID: identity.DeriveID("Other"), Name: "Other", Kind: "other", SourceRefs: interactionRefs(30, 30)},
-		{NPCID: identity.DeriveID("Opponent"), Name: "Opponent", Kind: "combat_opponent", SourceRefs: interactionRefs(20, 20)},
-		{NPCID: identity.DeriveID("Ally"), Name: "Ally", Kind: "combat_ally", SourceRefs: interactionRefs(5, 5)},
-		{NPCID: identity.DeriveID("Speaker"), Name: "Speaker", Kind: "dialogue", SourceRefs: append(interactionRefs(2, 2), interactionRefs(2, 2)...)},
-		{NPCID: identity.DeriveID("Present"), Name: "Present", Kind: "noncombat_presence", SourceRefs: interactionRefs(7, 7)},
-		{NPCID: identity.DeriveID("Mentioned"), Name: "Mentioned", Kind: "mentioned", SourceRefs: interactionRefs(10, 10)},
-		{NPCID: identity.DeriveID("Invalid"), Name: "Invalid", Kind: "unsupported", SourceRefs: interactionRefs(0, 0)},
+	client := &fakeOccurrencesLLMClient{response: extractionResponse{Occurrences: []occurrenceResponse{
+		{NPCID: identity.DeriveID("Other"), Name: "Other", Kind: "other", SourceRefs: occurrenceRefs(30, 30)},
+		{NPCID: identity.DeriveID("Opponent"), Name: "Opponent", Kind: "combat_opponent", SourceRefs: occurrenceRefs(20, 20)},
+		{NPCID: identity.DeriveID("Ally"), Name: "Ally", Kind: "combat_ally", SourceRefs: occurrenceRefs(5, 5)},
+		{NPCID: identity.DeriveID("Speaker"), Name: "Speaker", Kind: "dialogue", SourceRefs: append(occurrenceRefs(2, 2), occurrenceRefs(2, 2)...)},
+		{NPCID: identity.DeriveID("Present"), Name: "Present", Kind: "noncombat_presence", SourceRefs: occurrenceRefs(7, 7)},
+		{NPCID: identity.DeriveID("Mentioned"), Name: "Mentioned", Kind: "mentioned", SourceRefs: occurrenceRefs(10, 10)},
+		{NPCID: identity.DeriveID("Invalid"), Name: "Invalid", Kind: "unsupported", SourceRefs: occurrenceRefs(0, 0)},
 	}}}
 	references := requiredRegistryReferences(t, "Mentioned", "Speaker", "Present", "Ally", "Opponent", "Other", "Invalid")
 	req := extractionRequest()
@@ -34,10 +34,10 @@ func TestExtractMapsEveryKindAndOrdersBySourcePosition(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Extract() error = %v", err)
 	}
-	if got := interactionNames(result.Value); !reflect.DeepEqual(got, []string{"Mentioned", "Speaker", "Present", "Ally", "Opponent", "Other", "Invalid"}) {
-		t.Fatalf("interaction order = %#v", got)
+	if got := occurrenceNames(result.Value); !reflect.DeepEqual(got, []string{"Mentioned", "Speaker", "Present", "Ally", "Opponent", "Other", "Invalid"}) {
+		t.Fatalf("occurrence order = %#v", got)
 	}
-	if got := interactionKinds(result.Value); !reflect.DeepEqual(got, []dnd.NPCOccurrenceKind{
+	if got := occurrenceKinds(result.Value); !reflect.DeepEqual(got, []dnd.NPCOccurrenceKind{
 		dnd.NPCOccurrenceKindMentioned,
 		dnd.NPCOccurrenceKindDialogue,
 		dnd.NPCOccurrenceKindNoncombatPresence,
@@ -46,7 +46,7 @@ func TestExtractMapsEveryKindAndOrdersBySourcePosition(t *testing.T) {
 		dnd.NPCOccurrenceKindOther,
 		"unsupported",
 	}) {
-		t.Fatalf("interaction kinds = %#v", got)
+		t.Fatalf("occurrence kinds = %#v", got)
 	}
 	if refs := result.Value.Occurrences[1].SourceRefs; !reflect.DeepEqual(refs, []source.SourceRef{{SourceID: "session-alpha", StartUnitID: 2, EndUnitID: 2}}) {
 		t.Fatalf("canonical source refs = %#v", refs)
@@ -59,16 +59,16 @@ func TestExtractMapsEveryKindAndOrdersBySourcePosition(t *testing.T) {
 	}
 }
 
-func TestExtractUsesDocumentOrderForReferencesAndInteractions(t *testing.T) {
-	client := &fakeInteractionsLLMClient{response: extractionResponse{Occurrences: []occurrenceResponse{
-		{NPCID: identity.DeriveID("Later"), Name: "Later", Kind: "dialogue", SourceRefs: interactionRefs(10, 10)},
-		{NPCID: identity.DeriveID("First"), Name: "First", Kind: "mentioned", SourceRefs: []interactionSourceRefResponse{
+func TestExtractUsesDocumentOrderForReferencesAndOccurrences(t *testing.T) {
+	client := &fakeOccurrencesLLMClient{response: extractionResponse{Occurrences: []occurrenceResponse{
+		{NPCID: identity.DeriveID("Later"), Name: "Later", Kind: "dialogue", SourceRefs: occurrenceRefs(10, 10)},
+		{NPCID: identity.DeriveID("First"), Name: "First", Kind: "mentioned", SourceRefs: []occurrenceSourceRefResponse{
 			{StartUnitID: 10, EndUnitID: 10},
 			{StartUnitID: 30, EndUnitID: 30},
 			{StartUnitID: 30, EndUnitID: 30},
 			{StartUnitID: 999, EndUnitID: 0},
 		}},
-		{NPCID: identity.DeriveID("Second"), Name: "Second", Kind: "other", SourceRefs: interactionRefs(30, 30)},
+		{NPCID: identity.DeriveID("Second"), Name: "Second", Kind: "other", SourceRefs: occurrenceRefs(30, 30)},
 	}}}
 	references := requiredRegistryReferences(t, "Later", "First", "Second")
 	req := extractionRequest()
@@ -81,16 +81,16 @@ func TestExtractUsesDocumentOrderForReferencesAndInteractions(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Extract() error = %v", err)
 	}
-	if got := interactionNames(result.Value); !reflect.DeepEqual(got, []string{"First", "Second", "Later"}) {
-		t.Fatalf("interaction order = %#v, want document chronology with stable equal-evidence ties", got)
+	if got := occurrenceNames(result.Value); !reflect.DeepEqual(got, []string{"First", "Second", "Later"}) {
+		t.Fatalf("occurrence order = %#v, want document chronology with stable equal-evidence ties", got)
 	}
 	refs := result.Value.Occurrences[0].SourceRefs
 	if got := []int{refs[0].StartUnitID, refs[1].StartUnitID, refs[2].StartUnitID}; !reflect.DeepEqual(got, []int{30, 10, 999}) {
 		t.Fatalf("source refs = %#v, want document order with exact duplicate removed", refs)
 	}
 	refs[0].StartUnitID = 777
-	for _, interaction := range client.response.Occurrences {
-		for _, ref := range interaction.SourceRefs {
+	for _, occurrence := range client.response.Occurrences {
+		for _, ref := range occurrence.SourceRefs {
 			if ref.StartUnitID == 777 {
 				t.Fatal("result source references alias the model response")
 			}
@@ -102,14 +102,14 @@ func TestNewRequiresLLMAndRejectsAmbiguousReferenceSets(t *testing.T) {
 	if _, err := New(nil, Options{}); err == nil || !strings.Contains(err.Error(), "LLM client") {
 		t.Fatalf("New(nil) error = %v", err)
 	}
-	if _, err := New(&fakeInteractionsLLMClient{}, Options{}, contracts.ReferenceSet{}, contracts.ReferenceSet{}); err == nil || !strings.Contains(err.Error(), "at most one reference set") {
+	if _, err := New(&fakeOccurrencesLLMClient{}, Options{}, contracts.ReferenceSet{}, contracts.ReferenceSet{}); err == nil || !strings.Contains(err.Error(), "at most one reference set") {
 		t.Fatalf("New() error = %v", err)
 	}
 }
 
 func TestExtractUsesRegistryIDsAndCurrentTranscriptEvidence(t *testing.T) {
-	client := &fakeInteractionsLLMClient{response: extractionResponse{Occurrences: []occurrenceResponse{{
-		NPCID: identity.DeriveID("Mira Thorn"), Name: "Mira Thorn", Kind: "dialogue", SourceRefs: interactionRefs(10, 10),
+	client := &fakeOccurrencesLLMClient{response: extractionResponse{Occurrences: []occurrenceResponse{{
+		NPCID: identity.DeriveID("Mira Thorn"), Name: "Mira Thorn", Kind: "dialogue", SourceRefs: occurrenceRefs(10, 10),
 	}}}}
 	references := requiredRegistryReferences(t, "Mira Thorn", "Hooded Guard")
 	req := extractionRequest()
@@ -130,7 +130,7 @@ func TestExtractUsesRegistryIDsAndCurrentTranscriptEvidence(t *testing.T) {
 	if strings.Contains(string(request.Inputs["transcript"].Content), "other-session") {
 		t.Fatal("transcript input contains registry evidence")
 	}
-	metadata, err := json.Marshal(newExtractor(t, &fakeInteractionsLLMClient{}, references).ManifestMetadata())
+	metadata, err := json.Marshal(newExtractor(t, &fakeOccurrencesLLMClient{}, references).ManifestMetadata())
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -140,7 +140,7 @@ func TestExtractUsesRegistryIDsAndCurrentTranscriptEvidence(t *testing.T) {
 }
 
 func TestExtractRequiresBoundRegistryBeforeLLMCall(t *testing.T) {
-	client := &fakeInteractionsLLMClient{}
+	client := &fakeOccurrencesLLMClient{}
 	if _, err := newExtractor(t, client).Extract(context.Background(), extractionRequest()); err == nil || !strings.Contains(err.Error(), "NPC registry reference is required") {
 		t.Fatalf("Extract() error = %v, want required registry failure", err)
 	}
@@ -169,11 +169,11 @@ func TestExtractRejectsUnknownIDsAndMismatchedNames(t *testing.T) {
 		occurrence occurrenceResponse
 		want       string
 	}{
-		{"unknown ID", occurrenceResponse{NPCID: "npc:unknown", Name: "Mira Thorn", Kind: "dialogue", SourceRefs: interactionRefs(10, 10)}, "npc_id is not in the NPC registry"},
-		{"mismatched name", occurrenceResponse{NPCID: identity.DeriveID("Mira Thorn"), Name: "Hooded Guard", Kind: "dialogue", SourceRefs: interactionRefs(10, 10)}, "name does not match npc_id"},
+		{"unknown ID", occurrenceResponse{NPCID: "npc:unknown", Name: "Mira Thorn", Kind: "dialogue", SourceRefs: occurrenceRefs(10, 10)}, "npc_id is not in the NPC registry"},
+		{"mismatched name", occurrenceResponse{NPCID: identity.DeriveID("Mira Thorn"), Name: "Hooded Guard", Kind: "dialogue", SourceRefs: occurrenceRefs(10, 10)}, "name does not match npc_id"},
 	} {
 		t.Run(test.name, func(t *testing.T) {
-			client := &fakeInteractionsLLMClient{response: extractionResponse{Occurrences: []occurrenceResponse{test.occurrence}}}
+			client := &fakeOccurrencesLLMClient{response: extractionResponse{Occurrences: []occurrenceResponse{test.occurrence}}}
 			req := extractionRequest()
 			req.References = references
 			if _, err := newExtractor(t, client, references).Extract(context.Background(), req); err == nil || !strings.Contains(err.Error(), test.want) {
@@ -184,7 +184,7 @@ func TestExtractRejectsUnknownIDsAndMismatchedNames(t *testing.T) {
 }
 
 func TestExtractResolvesGeneratedRegistryAtOperationTime(t *testing.T) {
-	client := &fakeInteractionsLLMClient{response: extractionResponse{Occurrences: []occurrenceResponse{}}}
+	client := &fakeOccurrencesLLMClient{response: extractionResponse{Occurrences: []occurrenceResponse{}}}
 	references := requiredRegistryReferences(t, "Mira Thorn")
 	req := extractionRequest()
 	req.References = references
@@ -212,12 +212,12 @@ func TestExtractAcceptsEmptyBoundRegistryAndEmptyResponse(t *testing.T) {
 			Items: []contracts.ReferenceItem{{SlotName: NPCRegistryReferenceSlot, MediaType: npccodec.MediaType, Content: content}},
 		},
 	}}
-	client := &fakeInteractionsLLMClient{response: extractionResponse{Occurrences: []occurrenceResponse{}}}
+	client := &fakeOccurrencesLLMClient{response: extractionResponse{Occurrences: []occurrenceResponse{}}}
 	req := extractionRequest()
 	req.References = references
 	result, err := newExtractor(t, client, references).Extract(context.Background(), req)
 	if err != nil || result.Value.Occurrences == nil || len(result.Value.Occurrences) != 0 {
-		t.Fatalf("Extract() = %#v, %v; want present empty interactions", result, err)
+		t.Fatalf("Extract() = %#v, %v; want present empty occurrences", result, err)
 	}
 }
 
@@ -225,7 +225,7 @@ func TestExtractRejectsInvalidRequestsAndProviderFailures(t *testing.T) {
 	references := requiredRegistryReferences(t, "Mira Thorn")
 	valid := extractionRequest()
 	valid.References = references
-	extractor := newExtractor(t, &fakeInteractionsLLMClient{}, references)
+	extractor := newExtractor(t, &fakeOccurrencesLLMClient{}, references)
 	var nilExtractor *Extractor
 	for _, test := range []struct {
 		name      string
@@ -244,14 +244,14 @@ func TestExtractRejectsInvalidRequestsAndProviderFailures(t *testing.T) {
 			}
 		})
 	}
-	if _, err := newExtractor(t, &fakeInteractionsLLMClient{err: errors.New("provider unavailable")}, references).Extract(context.Background(), valid); err == nil || !strings.Contains(err.Error(), "provider unavailable") {
+	if _, err := newExtractor(t, &fakeOccurrencesLLMClient{err: errors.New("provider unavailable")}, references).Extract(context.Background(), valid); err == nil || !strings.Contains(err.Error(), "provider unavailable") {
 		t.Fatalf("provider error = %v", err)
 	}
 }
 
 func TestModuleSpecRegistrationMetadataAndFingerprints(t *testing.T) {
 	got := ModuleSpec()
-	if got.Key != Key || got.Stage != pipeline.StageExtract || got.ArtifactKind != dnd.NPCOccurrenceListKind || !reflect.DeepEqual(got.Requires, []string{"chunks", "source.transcript"}) || !reflect.DeepEqual(got.Provides, []string{"dnd.npc_interactions"}) {
+	if got.Key != Key || got.Stage != pipeline.StageExtract || got.ArtifactKind != dnd.NPCOccurrenceListKind || !reflect.DeepEqual(got.Requires, []string{"chunks", "source.transcript"}) || !reflect.DeepEqual(got.Provides, []string{"dnd.npc_occurrences"}) {
 		t.Fatalf("ModuleSpec() = %#v", got)
 	}
 	var registrySlot contracts.ReferenceSlot
@@ -267,9 +267,9 @@ func TestModuleSpecRegistrationMetadataAndFingerprints(t *testing.T) {
 	if ModuleSpec().ReferenceSlots[0].AcceptedMediaTypes[0] == "changed" {
 		t.Fatal("ModuleSpec() returned mutable reference slots")
 	}
-	extractorSlots := newExtractor(t, &fakeInteractionsLLMClient{}).ReferenceSlots()
+	extractorSlots := newExtractor(t, &fakeOccurrencesLLMClient{}).ReferenceSlots()
 	extractorSlots[0].AcceptedMediaTypes[0] = "changed"
-	if newExtractor(t, &fakeInteractionsLLMClient{}).ReferenceSlots()[0].AcceptedMediaTypes[0] == "changed" {
+	if newExtractor(t, &fakeOccurrencesLLMClient{}).ReferenceSlots()[0].AcceptedMediaTypes[0] == "changed" {
 		t.Fatal("ReferenceSlots() returned mutable reference slots")
 	}
 	registry := pipeline.NewExtractorRegistry()
@@ -284,7 +284,7 @@ func TestModuleSpecRegistrationMetadataAndFingerprints(t *testing.T) {
 	}
 
 	references := requiredRegistryReferences(t, "Mira Thorn")
-	extractor := newExtractor(t, &fakeInteractionsLLMClient{}, references)
+	extractor := newExtractor(t, &fakeOccurrencesLLMClient{}, references)
 	metadata := extractor.ManifestMetadata()
 	for key, want := range map[string]string{
 		"prompt_id": PromptID, "prompt_version": SchemaVersion, "mapping_policy": mappingPolicy,
@@ -320,7 +320,7 @@ func extractionRequest() contracts.TypedExtractionRequest {
 	return contracts.TypedExtractionRequest{
 		Source: doc, Chunk: chunk,
 		SourceInput: contracts.NewLLMInputMaterial("source", chunk.MediaType, chunk.Content, "sha256:chunk", "file:///session-alpha.json"),
-		SessionID:   "session-123", LLMProfile: "profile-npc-interactions",
+		SessionID:   "session-123", LLMProfile: "profile-npc-occurrences",
 	}
 }
 
@@ -359,22 +359,22 @@ func requiredRegistryReferences(t *testing.T, names ...string) contracts.Referen
 	}}
 }
 
-func interactionRefs(start, end int) []interactionSourceRefResponse {
-	return []interactionSourceRefResponse{{StartUnitID: start, EndUnitID: end}}
+func occurrenceRefs(start, end int) []occurrenceSourceRefResponse {
+	return []occurrenceSourceRefResponse{{StartUnitID: start, EndUnitID: end}}
 }
 
-func interactionNames(value dnd.NPCOccurrenceList) []string {
+func occurrenceNames(value dnd.NPCOccurrenceList) []string {
 	names := make([]string, len(value.Occurrences))
-	for index, interaction := range value.Occurrences {
-		names[index] = interaction.Name
+	for index, occurrence := range value.Occurrences {
+		names[index] = occurrence.Name
 	}
 	return names
 }
 
-func interactionKinds(value dnd.NPCOccurrenceList) []dnd.NPCOccurrenceKind {
+func occurrenceKinds(value dnd.NPCOccurrenceList) []dnd.NPCOccurrenceKind {
 	kinds := make([]dnd.NPCOccurrenceKind, len(value.Occurrences))
-	for index, interaction := range value.Occurrences {
-		kinds[index] = interaction.Kind
+	for index, occurrence := range value.Occurrences {
+		kinds[index] = occurrence.Kind
 	}
 	return kinds
 }
@@ -393,13 +393,13 @@ func newExtractor(t *testing.T, client contracts.StructuredLLMClient, references
 	return extractor
 }
 
-type fakeInteractionsLLMClient struct {
+type fakeOccurrencesLLMClient struct {
 	response extractionResponse
 	err      error
 	requests []contracts.StructuredCompletionRequest
 }
 
-func (client *fakeInteractionsLLMClient) CompleteStructured(_ context.Context, req contracts.StructuredCompletionRequest, out any) (contracts.StructuredCompletionResponse, error) {
+func (client *fakeOccurrencesLLMClient) CompleteStructured(_ context.Context, req contracts.StructuredCompletionRequest, out any) (contracts.StructuredCompletionResponse, error) {
 	client.requests = append(client.requests, cloneStructuredCompletionRequest(req))
 	if client.err != nil {
 		return contracts.StructuredCompletionResponse{}, client.err

internal/modules/dnd/extract/npcoccurrences/model.go

@@ -0,0 +1,17 @@
+package npcoccurrences
+
+type extractionResponse struct {
+	Occurrences []occurrenceResponse `json:"occurrences"`
+}
+
+type occurrenceResponse struct {
+	NPCID      string                        `json:"npc_id"`
+	Name       string                        `json:"name"`
+	Kind       string                        `json:"kind"`
+	SourceRefs []occurrenceSourceRefResponse `json:"source_refs"`
+}
+
+type occurrenceSourceRefResponse struct {
+	StartUnitID int `json:"start_unit_id"`
+	EndUnitID   int `json:"end_unit_id"`
+}

internal/modules/dnd/extract/npcoccurrences/model_test.go

@@ -1,4 +1,4 @@
-package npcinteractions
+package npcoccurrences
 
 import (
 	"encoding/json"
@@ -12,7 +12,7 @@ func TestExtractionResponsePreservesValidatorOwnedSemantics(t *testing.T) {
 		t.Fatalf("json.Unmarshal() error = %v", err)
 	}
 	occurrence := response.Occurrences[0]
-	if occurrence.NPCID != "" || occurrence.Name != "" || occurrence.Kind != "unsupported" || occurrence.SourceRefs[0] != (interactionSourceRefResponse{StartUnitID: 0, EndUnitID: -1}) {
+	if occurrence.NPCID != "" || occurrence.Name != "" || occurrence.Kind != "unsupported" || occurrence.SourceRefs[0] != (occurrenceSourceRefResponse{StartUnitID: 0, EndUnitID: -1}) {
 		t.Fatalf("decoded response = %#v", occurrence)
 	}
 }

internal/modules/dnd/extract/npcoccurrences/prompt_assets.go

@@ -1,4 +1,4 @@
-package npcinteractions
+package npcoccurrences
 
 import (
 	"fmt"
@@ -14,7 +14,7 @@ import (
 const promptAssetRoot = "assets/prompts"
 
 var promptAssetManifest = shared.PromptAssetManifest{
-	ModuleDir: "dnd.npc_interactions",
+	ModuleDir: "dnd.npc_occurrences",
 	ModuleFiles: []promptfs.ModulePromptFile{
 		{Name: "prompt.yaml", Path: "prompts/prompt.yaml"},
 		{Name: "instructions.md", Path: "prompts/instructions.md"},
@@ -30,9 +30,9 @@ var promptAssetManifest = shared.PromptAssetManifest{
 }
 
 func moduleAssetFS() (fs.FS, error) {
-	assets, err := fs.Sub(rootassets.FS(), "dnd/npc-interactions")
+	assets, err := fs.Sub(rootassets.FS(), "dnd/npc-occurrences")
 	if err != nil {
-		return nil, fmt.Errorf("scope NPC-interaction assets: %w", err)
+		return nil, fmt.Errorf("scope NPC-occurrence assets: %w", err)
 	}
 	return assets, nil
 }
@@ -44,14 +44,14 @@ func RegisterPromptAssets(registry *llm.AssetRegistry) error {
 	}
 	promptFS, err := promptAssetManifest.PromptFS(assets)
 	if err != nil {
-		return fmt.Errorf("prepare NPC-interaction prompt assets: %w", err)
+		return fmt.Errorf("prepare NPC-occurrence prompt assets: %w", err)
 	}
 	if err := registry.RegisterPromptFS(promptFS, promptAssetRoot); err != nil {
 		return err
 	}
 	schemas, err := fs.Sub(assets, "schemas")
 	if err != nil {
-		return fmt.Errorf("scope NPC-interaction schemas: %w", err)
+		return fmt.Errorf("scope NPC-occurrence schemas: %w", err)
 	}
 	return registry.RegisterSchemaFS(schemas, ".")
 }

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

@@ -1,4 +1,4 @@
-package npcinteractions
+package npcoccurrences
 
 import (
 	"context"
@@ -11,7 +11,7 @@ import (
 	"gitea.maximumdirect.net/eric/promptkit"
 )
 
-func TestRegisterPromptAssetsAndPrepareInteractionPrompt(t *testing.T) {
+func TestRegisterPromptAssetsAndPrepareOccurrencePrompt(t *testing.T) {
 	registry := llm.NewAssetRegistry()
 	if err := RegisterPromptAssets(registry); err != nil {
 		t.Fatal(err)
@@ -28,21 +28,21 @@ func TestRegisterPromptAssetsAndPrepareInteractionPrompt(t *testing.T) {
 		t.Fatal(err)
 	}
 	options = append(options, promptkit.WithProfiles(promptkit.OpenAICompatibleProfile(promptkit.OpenAICompatibleProfileConfig{
-		ID: "npc-interactions-test-profile", Endpoint: "http://127.0.0.1:1/v1", Model: "npc-interactions-test-model",
+		ID: "npc-occurrences-test-profile", Endpoint: "http://127.0.0.1:1/v1", Model: "npc-occurrences-test-model",
 	})))
 	engine, err := promptkit.NewEngine(promptkit.Config{Timeout: time.Second}, options...)
 	if err != nil {
 		t.Fatal(err)
 	}
-	transcript := `{"units":[{"sentinel":"interaction-transcript"}]}`
+	transcript := `{"units":[{"sentinel":"occurrence-transcript"}]}`
 	prepared, err := engine.Prepare(context.Background(), promptkit.RunRequest{
-		PromptID: PromptID, PromptVersion: SchemaVersion, ProfileID: "npc-interactions-test-profile",
+		PromptID: PromptID, PromptVersion: SchemaVersion, ProfileID: "npc-occurrences-test-profile",
 		Inputs: map[string]promptkit.ArtifactRef{
 			"transcript":   promptkit.InlineWithURI("file:///session.json", transcript),
-			"players":      promptkit.Inline("interaction-player"),
+			"players":      promptkit.Inline("occurrence-player"),
 			"party":        promptkit.Inline("Mira: ranger"),
 			"glossary":     promptkit.Inline("Greencloak: title"),
-			"npc_registry": promptkit.Inline(`{"npcs":[{"id":"npc:sha256:test","name":"interaction-npc"}]}`),
+			"npc_registry": promptkit.Inline(`{"npcs":[{"id":"npc:sha256:test","name":"occurrence-npc"}]}`),
 		},
 	})
 	if err != nil {
@@ -58,7 +58,7 @@ func TestPromptMetadataDoesNotExposeAssetContent(t *testing.T) {
 	if err != nil || !strings.HasPrefix(hash, "sha256:") {
 		t.Fatalf("promptAssetMetadata() = %q, %v", hash, err)
 	}
-	metadata := newExtractor(t, &fakeInteractionsLLMClient{}).ManifestMetadata()
+	metadata := newExtractor(t, &fakeOccurrencesLLMClient{}).ManifestMetadata()
 	for _, forbidden := range []string{"common-dnd-system", "dnd_npc_occurrences_llm.v1.json"} {
 		if strings.Contains(strings.Join(mapValues(metadata), " "), forbidden) {
 			t.Fatalf("metadata leaked prompt or schema content %q: %#v", forbidden, metadata)

internal/modules/dnd/extract/npcoccurrences/schema.go

@@ -1,9 +1,9 @@
-package npcinteractions
+package npcoccurrences
 
 import "gitea.maximumdirect.net/eric/notarius/internal/framework/llm"
 
 const (
-	PromptID           = "dnd.npc_interactions"
+	PromptID           = "dnd.npc_occurrences"
 	ResponseSchemaKey  = llm.ResponseSchemaKey("dnd_npc_occurrences_llm")
 	ResponseSchemaID   = "notarius.dnd.npc_occurrences.llm"
 	ResponseSchemaName = "notarius_dnd_npc_occurrences_llm_v1"

internal/modules/dnd/extract/npcoccurrences/schema_test.go

@@ -1,4 +1,4 @@
-package npcinteractions
+package npcoccurrences
 
 import (
 	"bytes"
@@ -17,7 +17,7 @@ func TestResponseSchemaOwnsOnlyPrivateStructuralContract(t *testing.T) {
 	if schema.Key != ResponseSchemaKey || schema.ID != ResponseSchemaID || schema.Name != ResponseSchemaName || schema.Version != SchemaVersion || !strings.HasPrefix(schema.SHA256, "sha256:") || !json.Valid(schema.JSONSchema) {
 		t.Fatalf("schema = %#v", schema)
 	}
-	valid := validInteractionResponse()
+	valid := validOccurrenceResponse()
 	content, err := json.Marshal(valid)
 	if err != nil {
 		t.Fatal(err)
@@ -26,11 +26,11 @@ func TestResponseSchemaOwnsOnlyPrivateStructuralContract(t *testing.T) {
 		t.Fatalf("valid response rejected: %v", err)
 	}
 
-	semanticCandidate := validInteractionResponse()
-	interaction := semanticCandidate["occurrences"].([]any)[0].(map[string]any)
-	interaction["name"] = ""
-	interaction["kind"] = "unsupported"
-	ref := interaction["source_refs"].([]any)[0].(map[string]any)
+	semanticCandidate := validOccurrenceResponse()
+	occurrence := semanticCandidate["occurrences"].([]any)[0].(map[string]any)
+	occurrence["name"] = ""
+	occurrence["kind"] = "unsupported"
+	ref := occurrence["source_refs"].([]any)[0].(map[string]any)
 	ref["start_unit_id"] = 0
 	ref["end_unit_id"] = -1
 	content, err = json.Marshal(semanticCandidate)
@@ -50,7 +50,7 @@ func TestResponseSchemaOwnsOnlyPrivateStructuralContract(t *testing.T) {
 			record["source_refs"].([]any)[0].(map[string]any)["source_id"] = "assigned later"
 		},
 	} {
-		candidate := validInteractionResponse()
+		candidate := validOccurrenceResponse()
 		mutate(candidate["occurrences"].([]any)[0].(map[string]any))
 		content, err := json.Marshal(candidate)
 		if err != nil {
@@ -79,7 +79,7 @@ func TestResponseSchemaIsDefensiveAndContentSafe(t *testing.T) {
 	}
 }
 
-func validInteractionResponse() map[string]any {
+func validOccurrenceResponse() map[string]any {
 	return map[string]any{"occurrences": []any{map[string]any{
 		"npc_id": "npc:sha256:test", "name": "Mira Thorn", "kind": "dialogue",
 		"source_refs": []any{map[string]any{"start_unit_id": 1, "end_unit_id": 2}},