Verify complete D&D entity handoffs

2026-08-05 20:07:31 +00:00
parent a6e176e160
commit 6de470d541
5 changed files with 260 additions and 36 deletions
--- a/internal/cli/dnd_enemy_events_contract_test.go
+++ b/internal/cli/dnd_enemy_events_contract_test.go
@@ -20,8 +20,12 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/chunk/scenes"
+	itemoccurrencecodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/itemoccurrences"
+	itemregistrycodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/itemregistry"
 	locationoccurrencecodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/locationoccurrences"
 	locationcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/locationregistry"
+	npcoccurrencecodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/npcoccurrences"
+	npccodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/npcregistry"
 	combat "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/combatturns"
 	enemyevents "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/enemyevents"
 	itemoccurrences "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/itemoccurrences"
@@ -57,7 +61,7 @@ func TestProductionEnemyEventConfigurationResolvesGeneratedHandoffs(t *testing.T
 		t.Fatalf("enemy event lane = %#v, want typed production composition", lane)
 	}
 	for slot, want := range map[string]struct{ step, lane string }{
-		"npc_registry":       {step: "describe-session", lane: "npc_registry"},
+		"npc_registry":       {step: "describe-session", lane: "npc-registry"},
 		"scene_descriptions": {step: "describe-session", lane: "scene-descriptions"},
 		"combat_turns":       {step: "extract-events", lane: "combat-turns"},
 		"npc_occurrences":    {step: "extract-events", lane: "npc-occurrences"},
@@ -67,7 +71,7 @@ func TestProductionEnemyEventConfigurationResolvesGeneratedHandoffs(t *testing.T
 			t.Fatalf("enemy event %s reference = %#v, want generated %s/%s artifact", slot, binding, want.step, want.lane)
 		}
 	}
-	if binding, found := generatedReferenceBinding(lane.NormalizeReferences.Bindings, "npc_registry"); !found || binding.Artifact.Step != "describe-session" || binding.Artifact.Lane != "npc_registry" {
+	if binding, found := generatedReferenceBinding(lane.NormalizeReferences.Bindings, "npc_registry"); !found || binding.Artifact.Step != "describe-session" || binding.Artifact.Lane != "npc-registry" {
 		t.Fatalf("enemy event normalizer NPC reference = %#v, want generated NPC artifact", binding)
 	}

@@ -97,7 +101,7 @@ func TestProductionEnemyEventConfigurationResolvesGeneratedHandoffs(t *testing.T
 	}
 }

-func TestMaintainedCompleteExampleProducesEnemyEventsThroughGeneratedHandoffs(t *testing.T) {
+func TestMaintainedCompleteExamplePublishesRegistryBackedEntityOccurrences(t *testing.T) {
 	t.Chdir(repositoryPath())
 	outputRoot := filepath.Join(t.TempDir(), "output")
 	configPath := completeExampleConfigWithTemporaryCache(t)
@@ -123,18 +127,17 @@ func TestMaintainedCompleteExampleProducesEnemyEventsThroughGeneratedHandoffs(t

 	runRoot := filepath.Join(outputRoot, productionRunID)
 	index := readProductionJSON[exampleOutputIndex](t, filepath.Join(runRoot, "index.json"))
-	var enemyOutput exampleOutputIndexEntry
-	var locationOutput, occurrenceOutput exampleOutputIndexEntry
+	outputs := make(map[string]exampleOutputIndexEntry)
 	for _, entry := range index.OutputFiles {
-		switch entry.LaneID {
-		case "enemy-events":
-			enemyOutput = entry
-		case "locations":
-			locationOutput = entry
-		case "location-occurrences":
-			occurrenceOutput = entry
-		}
+		outputs[entry.LaneID] = entry
 	}
+	enemyOutput := outputs["enemy-events"]
+	locationOutput := outputs["location-registry"]
+	locationOccurrenceOutput := outputs["location-occurrences"]
+	npcRegistryOutput := outputs["npc-registry"]
+	npcOccurrenceOutput := outputs["npc-occurrences"]
+	itemRegistryOutput := outputs["item-registry"]
+	itemOccurrenceOutput := outputs["item-occurrences"]
 	if enemyOutput.File != "lanes/enemy-events.json" || enemyOutput.SchemaID != "notarius.dnd.enemy_events" || enemyOutput.SchemaVersion != "v1" {
 		t.Fatalf("enemy event output = %#v, want typed enemy-event JSON", enemyOutput)
 	}
@@ -142,23 +145,51 @@ func TestMaintainedCompleteExampleProducesEnemyEventsThroughGeneratedHandoffs(t
 	if len(value.Events) != 1 || value.Events[0].Name != "Kesh" || value.Events[0].Kind != dnd.EnemyEventKindFled || len(value.Events[0].SourceRefs) != 1 || value.Events[0].SourceRefs[0].SourceID != "session-ravenfall" || value.Events[0].SourceRefs[0].StartUnitID != 10 {
 		t.Fatalf("enemy event artifact = %#v, want source-linked Kesh fleeing event", value)
 	}
-	if locationOutput.File != "lanes/locations.json" || locationOutput.SchemaID != locationcodec.SchemaID || locationOutput.SchemaVersion != locationcodec.SchemaVersion {
+	if locationOutput.File != "lanes/location-registry.json" || locationOutput.SchemaID != locationcodec.SchemaID || locationOutput.SchemaVersion != locationcodec.SchemaVersion {
 		t.Fatalf("location output = %#v, want typed location registry JSON", locationOutput)
 	}
 	locationsValue := readProductionJSON[dnd.LocationRegistry](t, filepath.Join(runRoot, locationOutput.File))
 	if len(locationsValue.Locations) != 2 || locationsValue.Locations[0].Name != "Moon Gate" || locationsValue.Locations[1].Name != "Moon Gate" || locationsValue.Locations[0].ID == locationsValue.Locations[1].ID {
 		t.Fatalf("location registry = %#v, want distinct source-grounded identities for same-name locations", locationsValue)
 	}
-	if occurrenceOutput.File != "lanes/location-occurrences.json" || occurrenceOutput.SchemaID != locationoccurrencecodec.SchemaID || occurrenceOutput.SchemaVersion != locationoccurrencecodec.SchemaVersion {
-		t.Fatalf("location occurrence output = %#v, want typed occurrence JSON", occurrenceOutput)
+	if locationOccurrenceOutput.File != "lanes/location-occurrences.json" || locationOccurrenceOutput.SchemaID != locationoccurrencecodec.SchemaID || locationOccurrenceOutput.SchemaVersion != locationoccurrencecodec.SchemaVersion {
+		t.Fatalf("location occurrence output = %#v, want typed occurrence JSON", locationOccurrenceOutput)
 	}
-	occurrencesValue := readProductionJSON[dnd.LocationOccurrenceList](t, filepath.Join(runRoot, occurrenceOutput.File))
+	occurrencesValue := readProductionJSON[dnd.LocationOccurrenceList](t, filepath.Join(runRoot, locationOccurrenceOutput.File))
 	if len(occurrencesValue.Occurrences) != 2 || occurrencesValue.Occurrences[0].LocationID == occurrencesValue.Occurrences[1].LocationID || occurrencesValue.Occurrences[0].Name != "Moon Gate" || occurrencesValue.Occurrences[1].Name != "Moon Gate" {
 		t.Fatalf("location occurrences = %#v, want source-grounded references to distinct registry identities", occurrencesValue)
 	}
+	if npcRegistryOutput.File != "lanes/npc-registry.json" || npcRegistryOutput.SchemaID != npccodec.SchemaID || npcRegistryOutput.SchemaVersion != npccodec.SchemaVersion {
+		t.Fatalf("NPC registry output = %#v, want typed registry JSON", npcRegistryOutput)
+	}
+	npcRegistry := readProductionJSON[dnd.NPCRegistry](t, filepath.Join(runRoot, npcRegistryOutput.File))
+	if len(npcRegistry.NPCs) != 1 || npcRegistry.NPCs[0].Name != "Kesh" {
+		t.Fatalf("NPC registry = %#v, want Kesh identity", npcRegistry)
+	}
+	if npcOccurrenceOutput.File != "lanes/npc-occurrences.json" || npcOccurrenceOutput.SchemaID != npcoccurrencecodec.SchemaID || npcOccurrenceOutput.SchemaVersion != npcoccurrencecodec.SchemaVersion {
+		t.Fatalf("NPC occurrence output = %#v, want typed occurrence JSON", npcOccurrenceOutput)
+	}
+	npcOccurrences := readProductionJSON[dnd.NPCOccurrenceList](t, filepath.Join(runRoot, npcOccurrenceOutput.File))
+	if len(npcOccurrences.Occurrences) != 1 || npcOccurrences.Occurrences[0].NPCID != npcRegistry.NPCs[0].ID || npcOccurrences.Occurrences[0].Name != "Kesh" || len(npcOccurrences.Occurrences[0].SourceRefs) != 1 || npcOccurrences.Occurrences[0].SourceRefs[0].StartUnitID != 7 {
+		t.Fatalf("NPC occurrences = %#v, want independently evidenced Kesh registry grounding", npcOccurrences)
+	}
+	if itemRegistryOutput.File != "lanes/item-registry.json" || itemRegistryOutput.SchemaID != itemregistrycodec.SchemaID || itemRegistryOutput.SchemaVersion != itemregistrycodec.SchemaVersion {
+		t.Fatalf("item registry output = %#v, want typed registry JSON", itemRegistryOutput)
+	}
+	itemRegistry := readProductionJSON[dnd.ItemRegistry](t, filepath.Join(runRoot, itemRegistryOutput.File))
+	if len(itemRegistry.Items) != 1 || itemRegistry.Items[0].Name != "Moonblade" {
+		t.Fatalf("item registry = %#v, want Moonblade identity", itemRegistry)
+	}
+	if itemOccurrenceOutput.File != "lanes/item-occurrences.json" || itemOccurrenceOutput.SchemaID != itemoccurrencecodec.SchemaID || itemOccurrenceOutput.SchemaVersion != itemoccurrencecodec.SchemaVersion {
+		t.Fatalf("item occurrence output = %#v, want typed occurrence JSON", itemOccurrenceOutput)
+	}
+	itemOccurrences := readProductionJSON[dnd.ItemOccurrenceList](t, filepath.Join(runRoot, itemOccurrenceOutput.File))
+	if len(itemOccurrences.Occurrences) != 1 || itemOccurrences.Occurrences[0].ItemID != itemRegistry.Items[0].ID || itemOccurrences.Occurrences[0].Name != "Moonblade" || len(itemOccurrences.Occurrences[0].SourceRefs) != 1 || itemOccurrences.Occurrences[0].SourceRefs[0].StartUnitID != 5 {
+		t.Fatalf("item occurrences = %#v, want independently evidenced Moonblade registry grounding", itemOccurrences)
+	}

 	evidence := readProductionJSON[evidencecontext.Document](t, filepath.Join(runRoot, "evidence-context.json"))
-	for _, laneID := range []string{"enemy-events", "locations", "location-occurrences"} {
+	for _, laneID := range []string{"enemy-events", "npc-registry", "npc-occurrences", "item-registry", "item-occurrences", "location-registry", "location-occurrences"} {
 		if !containsString(evidence.SelectedLanes, laneID) || !evidenceHasLane(evidence, laneID) {
 			t.Fatalf("evidence context = %#v, want direct %s evidence", evidence, laneID)
 		}
@@ -192,6 +223,25 @@ func TestMaintainedCompleteExampleProducesEnemyEventsThroughGeneratedHandoffs(t
 			t.Fatalf("location occurrence registry input = %q, want source-free ID grounding", registryInput.Content)
 		}
 	}
+	for _, test := range []struct {
+		promptID string
+		slot     string
+		name     string
+	}{
+		{promptID: npcoccurrences.PromptID, slot: "npc_registry", name: "Kesh"},
+		{promptID: itemoccurrences.PromptID, slot: "item_registry", name: "Moonblade"},
+	} {
+		requests := client.requestsFor(test.promptID)
+		if len(requests) != 2 {
+			t.Fatalf("%s requests = %#v, want one request per scene", test.promptID, requests)
+		}
+		for _, request := range requests {
+			registryInput := request.Inputs[test.slot]
+			if !strings.Contains(string(registryInput.Content), test.name) || !strings.Contains(string(registryInput.Content), `"id"`) || strings.Contains(string(registryInput.Content), "source_refs") {
+				t.Fatalf("%s registry input = %q, want source-free ID grounding", test.promptID, registryInput.Content)
+			}
+		}
+	}
 }

 func completeExampleConfigWithTemporaryCache(t *testing.T) string {
@@ -256,11 +306,30 @@ func (client *enemyEventLLMClient) CompleteStructured(ctx context.Context, reque
 	case spells.PromptID:
 		content = []byte(`{"spell_casts":[]}`)
 	case itemregistry.PromptID:
-		content = []byte(`{"items":[]}`)
+		if combatScene {
+			content = []byte(`{"items":[]}`)
+		} else {
+			content = []byte(`{"items":[{"name":"Moonblade","source_refs":[{"start_unit_id":5,"end_unit_id":5}]}]}`)
+		}
 	case itemregistrynormalize.PromptID:
 		content = []byte(`{"duplicate_groups":[]}`)
 	case itemoccurrences.PromptID:
-		content = []byte(`{"occurrences":[]}`)
+		if combatScene {
+			content = []byte(`{"occurrences":[]}`)
+		} else {
+			var registry struct {
+				Items []struct {
+					ID string `json:"id"`
+				} `json:"items"`
+			}
+			if err := json.Unmarshal(request.Inputs["item_registry"].Content, &registry); err != nil {
+				return contracts.StructuredCompletionResponse{}, fmt.Errorf("decode generated item registry: %w", err)
+			}
+			if len(registry.Items) != 1 {
+				return contracts.StructuredCompletionResponse{}, fmt.Errorf("generated item registry has %d items, want 1", len(registry.Items))
+			}
+			content = []byte(fmt.Sprintf(`{"occurrences":[{"item_id":%q,"name":"Moonblade","kind":"discovered","quantity":null,"from":null,"to":null,"source_refs":[{"start_segment":5,"end_segment":5}]}]}`, registry.Items[0].ID))
+		}
 	case combat.PromptID:
 		content = []byte(`{"combat_turns":[{"actor":"Kesh","turn_kind":"turn","source_refs":[{"start_unit_id":8,"end_unit_id":8}]}]}`)
 	case npcoccurrences.PromptID: