Repair reversed D&D evidence ranges

2026-08-28 13:45:21 +00:00
parent a2610757cd
commit b178f1c684
36 changed files with 226 additions and 61 deletions
--- a/internal/modules/dnd/extract/combatturns/canonicalize.go
+++ b/internal/modules/dnd/extract/combatturns/canonicalize.go
@@ -45,7 +45,7 @@ func canonicalizeCombatTurn(turn *combatTurnResponse, order shared.SourceRefOrde
 	if turn == nil {
 		return 0, false
 	}
-	refs := order.Canonicalize(canonicalSourceRefs(turn.SourceRefs, sourceID))
+	refs := order.Canonicalize(order.OrderEndpoints(canonicalSourceRefs(turn.SourceRefs, sourceID)))
 	turn.SourceRefs = combatResponseRefs(refs)
 	return order.EarliestValid(refs)
 }
--- a/internal/modules/dnd/extract/combatturns/extractor.go
+++ b/internal/modules/dnd/extract/combatturns/extractor.go
@@ -15,7 +15,7 @@ import (

 const (
 	Key             = "dnd/combat-turns"
-	mappingPolicy   = "dnd.combat_turns.extract_mapping.v2"
+	mappingPolicy   = "dnd.combat_turns.extract_mapping.v3"
 	sceneGatePolicy = "dnd.combat_turns.scene_gate.v1"
 )

--- a/internal/modules/dnd/extract/combatturns/extractor_test.go
+++ b/internal/modules/dnd/extract/combatturns/extractor_test.go
@@ -25,8 +25,8 @@ func TestExtractMapsAndOrdersCombatTurnsBySourcePosition(t *testing.T) {
 		},
 		{
 			Actor: "Aria", TurnKind: "reaction", SourceRefs: []combatSourceRefResponse{
-				{StartUnitID: 10, EndUnitID: 10},
-				{StartUnitID: 10, EndUnitID: 10},
+				{StartUnitID: 2, EndUnitID: 10},
+				{StartUnitID: 2, EndUnitID: 10},
 			},
 		},
 		{
@@ -42,7 +42,7 @@ func TestExtractMapsAndOrdersCombatTurnsBySourcePosition(t *testing.T) {
 	if got := []string{result.Value.CombatTurns[0].Actor, result.Value.CombatTurns[1].Actor, result.Value.CombatTurns[2].Actor}; !reflect.DeepEqual(got, []string{"Aria", "Borin", "Unknown"}) {
 		t.Fatalf("actor order = %#v, want source-position order with invalid evidence last", got)
 	}
-	wantRefs := []source.SourceRef{{SourceID: "session-alpha", StartUnitID: 10, EndUnitID: 10}}
+	wantRefs := []source.SourceRef{{SourceID: "session-alpha", StartUnitID: 10, EndUnitID: 2}}
 	if !reflect.DeepEqual(result.Value.CombatTurns[0].SourceRefs, wantRefs) {
 		t.Fatalf("canonical refs = %#v, want %#v", result.Value.CombatTurns[0].SourceRefs, wantRefs)
 	}
--- a/internal/modules/dnd/extract/enemyevents/extractor.go
+++ b/internal/modules/dnd/extract/enemyevents/extractor.go
@@ -13,7 +13,7 @@ import (

 const (
 	Key             = "dnd/enemy-events"
-	mappingPolicy   = "dnd.enemy_events.extract_mapping.v1"
+	mappingPolicy   = "dnd.enemy_events.extract_mapping.v2"
 	sceneGatePolicy = "dnd.enemy_events.scene_gate.v1"
 )

--- a/internal/modules/dnd/extract/enemyevents/extractor_test.go
+++ b/internal/modules/dnd/extract/enemyevents/extractor_test.go
@@ -16,7 +16,7 @@ import (

 func TestExtractMapsEnemyEventsInSourceOrder(t *testing.T) {
 	client := &fakeEnemyEventsLLMClient{response: extractionResponse{Events: []enemyEventResponse{
-		{Name: "Ashfang", Kind: "killed", SourceRefs: []enemySourceRefResponse{{StartUnitID: 4, EndUnitID: 4}}},
+		{Name: "Ashfang", Kind: "killed", SourceRefs: []enemySourceRefResponse{{StartUnitID: 4, EndUnitID: 3}}},
 		{Name: "Ashfang", Kind: "engaged", SourceRefs: []enemySourceRefResponse{{StartUnitID: 1, EndUnitID: 1}, {StartUnitID: 1, EndUnitID: 1}}},
 		{Name: "Orcs", Kind: "fled", SourceRefs: []enemySourceRefResponse{{StartUnitID: 3, EndUnitID: 3}}},
 		{Name: "One orc", Kind: "captured", SourceRefs: []enemySourceRefResponse{{StartUnitID: 2, EndUnitID: 2}}},
@@ -31,14 +31,17 @@ func TestExtractMapsEnemyEventsInSourceOrder(t *testing.T) {
 		dnd.EnemyEventKindEngaged,
 		dnd.EnemyEventKindCaptured,
 		dnd.EnemyEventKindIncapacitated,
-		dnd.EnemyEventKindFled,
 		dnd.EnemyEventKindKilled,
+		dnd.EnemyEventKindFled,
 	}) {
 		t.Fatalf("event order = %#v", got)
 	}
 	if refs := result.Value.Events[0].SourceRefs; !reflect.DeepEqual(refs, []source.SourceRef{{SourceID: "combat-session", StartUnitID: 1, EndUnitID: 1}}) {
 		t.Fatalf("canonical source refs = %#v", refs)
 	}
+	if refs := result.Value.Events[3].SourceRefs; !reflect.DeepEqual(refs, []source.SourceRef{{SourceID: "combat-session", StartUnitID: 3, EndUnitID: 4}}) {
+		t.Fatalf("reversed source refs = %#v", refs)
+	}
 	if len(client.requests) != 1 {
 		t.Fatalf("LLM calls = %d, want 1", len(client.requests))
 	}
--- a/internal/modules/dnd/extract/enemyevents/mapping.go
+++ b/internal/modules/dnd/extract/enemyevents/mapping.go
@@ -20,7 +20,7 @@ func canonicalEnemyEventList(response extractionResponse, order shared.SourceRef
 	}
 	ordered := make([]orderedEnemyEvent, len(response.Events))
 	for index, event := range response.Events {
-		refs := order.Canonicalize(sourceRefs(event.SourceRefs, sourceID))
+		refs := order.Canonicalize(order.OrderEndpoints(sourceRefs(event.SourceRefs, sourceID)))
 		earliest, hasEvidence := order.EarliestValid(refs)
 		ordered[index] = orderedEnemyEvent{
 			value: dnd.EnemyEvent{
--- a/internal/modules/dnd/extract/itemoccurrences/canonicalize.go
+++ b/internal/modules/dnd/extract/itemoccurrences/canonicalize.go
@@ -26,7 +26,7 @@ func canonicalItemOccurrenceList(response extractionResponse, order shared.Sourc
 		if !found {
 			return dnd.ItemOccurrenceList{}, fmt.Errorf("occurrences[%d].name is not in the item registry", index)
 		}
-		refs := order.Canonicalize(itemOccurrenceSourceRefs(occurrence.SourceRefs, sourceID))
+		refs := order.Canonicalize(order.OrderEndpoints(itemOccurrenceSourceRefs(occurrence.SourceRefs, sourceID)))
 		earliest, hasEvidence := order.EarliestValid(refs)
 		ordered[index] = orderedItemOccurrence{
 			value: dnd.ItemOccurrence{
--- a/internal/modules/dnd/extract/itemoccurrences/extractor.go
+++ b/internal/modules/dnd/extract/itemoccurrences/extractor.go
@@ -20,7 +20,7 @@ const (
 	ItemRegistryMaxBytes      = itemregistry.MaxBytes
 )

-const mappingPolicy = "dnd.item_occurrences.extract_mapping.v2"
+const mappingPolicy = "dnd.item_occurrences.extract_mapping.v3"

 var requiredCapabilities = []string{
 	"chunks",
--- a/internal/modules/dnd/extract/itemoccurrences/extractor_test.go
+++ b/internal/modules/dnd/extract/itemoccurrences/extractor_test.go
@@ -11,7 +11,7 @@ import (

 func TestExtractGroundsOccurrencesInRequiredRegistry(t *testing.T) {
 	id := itemidentity.DeriveID("Torch")
-	rawResponse := []byte(`{"occurrences":[{"name":"Torch","kind":"lost","from":"party","source_refs":[{"start_unit_id":1,"end_unit_id":1}]}]}`)
+	rawResponse := []byte(`{"occurrences":[{"name":"Torch","kind":"lost","from":"party","source_refs":[{"start_unit_id":2,"end_unit_id":1}]}]}`)
 	client := &fakeItemOccurrencesLLMClient{content: append([]byte(nil), rawResponse...)}
 	req := extractionRequest()
 	req.References = itemRegistryReferences(t)
@@ -27,7 +27,7 @@ func TestExtractGroundsOccurrencesInRequiredRegistry(t *testing.T) {
 	if len(result.Value.Occurrences) != 1 || result.Value.Occurrences[0].ItemID != id || result.Value.Occurrences[0].Name != "Torch" {
 		t.Fatalf("occurrences = %#v", result.Value.Occurrences)
 	}
-	if refs := result.Value.Occurrences[0].SourceRefs; len(refs) != 1 || refs[0].SourceID != req.Source.ID || refs[0].StartUnitID != 1 || refs[0].EndUnitID != 1 {
+	if refs := result.Value.Occurrences[0].SourceRefs; len(refs) != 1 || refs[0].SourceID != req.Source.ID || refs[0].StartUnitID != 1 || refs[0].EndUnitID != 2 {
 		t.Fatalf("occurrence evidence = %#v, want current-source unit range", refs)
 	}
 	request := client.requests[0]
--- a/internal/modules/dnd/extract/itemregistry/canonicalize.go
+++ b/internal/modules/dnd/extract/itemregistry/canonicalize.go
@@ -43,7 +43,7 @@ func canonicalizeItem(item *itemResponse, order shared.SourceRefOrder, sourceID
 		return 0, false
 	}
 	item.Name = identity.NormalizeDisplay(item.Name)
-	refs := order.Canonicalize(canonicalSourceRefs(item.SourceRefs, sourceID))
+	refs := order.Canonicalize(order.OrderEndpoints(canonicalSourceRefs(item.SourceRefs, sourceID)))
 	item.SourceRefs = itemResponseRefs(refs)
 	return order.EarliestValid(refs)
 }
--- a/internal/modules/dnd/extract/itemregistry/extractor.go
+++ b/internal/modules/dnd/extract/itemregistry/extractor.go
@@ -14,7 +14,7 @@ import (

 const (
 	Key           = "dnd/item-registry"
-	mappingPolicy = "dnd.item_registry.extract_mapping.v1"
+	mappingPolicy = "dnd.item_registry.extract_mapping.v2"
 )

 var requiredCapabilities = []string{"chunks", "source.transcript"}
--- a/internal/modules/dnd/extract/itemregistry/extractor_test.go
+++ b/internal/modules/dnd/extract/itemregistry/extractor_test.go
@@ -15,7 +15,7 @@ import (

 func TestExtractMapsItemsWithOwnedEvidenceAndDeterministicOrder(t *testing.T) {
 	client := &fakeItemsLLMClient{response: extractionResponse{Items: []itemResponse{
-		{Name: "  Gold   Pieces ", SourceRefs: responseSourceRefs(3, 3)},
+		{Name: "  Gold   Pieces ", SourceRefs: responseSourceRefs(3, 2)},
 		{Name: "Star Compass", SourceRefs: []itemSourceRefResponse{{StartUnitID: 2, EndUnitID: 2}, {StartUnitID: 1, EndUnitID: 1}, {StartUnitID: 1, EndUnitID: 1}}},
 	}}}
 	result, err := newExtractor(t, client).Extract(context.Background(), extractionRequest())
@@ -25,7 +25,7 @@ func TestExtractMapsItemsWithOwnedEvidenceAndDeterministicOrder(t *testing.T) {
 	refs := []source.SourceRef{{SourceID: "session-items", StartUnitID: 1, EndUnitID: 1}, {SourceID: "session-items", StartUnitID: 2, EndUnitID: 2}}
 	want := dnd.ItemRegistry{Items: []dnd.Item{
 		{ID: identity.DeriveID("Star Compass"), Name: "Star Compass", SourceRefs: refs},
-		{ID: identity.DeriveID("Gold Pieces"), Name: "Gold Pieces", SourceRefs: []source.SourceRef{{SourceID: "session-items", StartUnitID: 3, EndUnitID: 3}}},
+		{ID: identity.DeriveID("Gold Pieces"), Name: "Gold Pieces", SourceRefs: []source.SourceRef{{SourceID: "session-items", StartUnitID: 2, EndUnitID: 3}}},
 	}}
 	if !reflect.DeepEqual(result.Value, want) {
 		t.Fatalf("Value = %#v, want %#v", result.Value, want)
--- a/internal/modules/dnd/extract/locationoccurrences/canonicalize.go
+++ b/internal/modules/dnd/extract/locationoccurrences/canonicalize.go
@@ -27,7 +27,7 @@ func canonicalOccurrenceList(response extractionResponse, order shared.SourceRef
 		if !ok {
 			return dnd.LocationOccurrenceList{}, fmt.Errorf("occurrence %d does not match a supplied location selector", index)
 		}
-		refs := order.Canonicalize(canonicalSourceRefs(occurrence.SourceRefs, sourceID))
+		refs := order.Canonicalize(order.OrderEndpoints(canonicalSourceRefs(occurrence.SourceRefs, sourceID)))
 		earliest, hasEvidence := order.EarliestValid(refs)
 		ordered[index] = orderedOccurrence{value: dnd.LocationOccurrence{
 			LocationID: location.ID,
--- a/internal/modules/dnd/extract/locationoccurrences/extractor.go
+++ b/internal/modules/dnd/extract/locationoccurrences/extractor.go
@@ -15,7 +15,7 @@ import (

 const (
 	Key           = "dnd/location-occurrences"
-	mappingPolicy = "dnd.location_occurrences.extract_mapping.v2"
+	mappingPolicy = "dnd.location_occurrences.extract_mapping.v3"
 )

 const (
--- a/internal/modules/dnd/extract/locationoccurrences/extractor_test.go
+++ b/internal/modules/dnd/extract/locationoccurrences/extractor_test.go
@@ -23,7 +23,7 @@ func TestExtractMapsKindsOrdersOccurrencesAndPreservesIndependentFacts(t *testin
 	client := &fakeOccurrencesLLMClient{response: extractionResponse{Occurrences: []occurrenceResponse{
 		{Name: second.Name, RegistryRefs: registryRefs(second), Kind: "mentioned", SourceRefs: occurrenceRefs(30, 30)},
 		{Name: first.Name, RegistryRefs: registryRefs(first), Kind: "mentioned", SourceRefs: occurrenceRefs(10, 10)},
-		{Name: first.Name, RegistryRefs: registryRefs(first), Kind: "recalled", SourceRefs: occurrenceRefs(10, 10)},
+		{Name: first.Name, RegistryRefs: registryRefs(first), Kind: "recalled", SourceRefs: occurrenceRefs(20, 10)},
 		{Name: first.Name, RegistryRefs: registryRefs(first), Kind: "planned", SourceRefs: occurrenceRefs(10, 10)},
 		{Name: first.Name, RegistryRefs: registryRefs(first), Kind: "visited", SourceRefs: append(occurrenceRefs(10, 10), occurrenceRefs(10, 10)...)},
 		{Name: first.Name, RegistryRefs: registryRefs(first), Kind: "visited", SourceRefs: occurrenceRefs(20, 20)},
@@ -49,6 +49,9 @@ func TestExtractMapsKindsOrdersOccurrencesAndPreservesIndependentFacts(t *testin
 	if !reflect.DeepEqual(got[0].SourceRefs, []source.SourceRef{{SourceID: req.Source.ID, StartUnitID: 10, EndUnitID: 10}}) {
 		t.Fatalf("canonical evidence = %#v", got[0].SourceRefs)
 	}
+	if !reflect.DeepEqual(got[2].SourceRefs, []source.SourceRef{{SourceID: req.Source.ID, StartUnitID: 10, EndUnitID: 20}}) {
+		t.Fatalf("reversed evidence = %#v", got[2].SourceRefs)
+	}
 }

 func TestExtractResolvesContextualSelectorsAndUsesCurrentTranscriptEvidenceOnly(t *testing.T) {
--- a/internal/modules/dnd/extract/locationregistry/canonicalize.go
+++ b/internal/modules/dnd/extract/locationregistry/canonicalize.go
@@ -42,7 +42,7 @@ func canonicalizeLocation(location *locationResponse, order shared.SourceRefOrde
 	if location == nil {
 		return 0, false
 	}
-	refs := order.Canonicalize(canonicalSourceRefs(location.SourceRefs, sourceID))
+	refs := order.Canonicalize(order.OrderEndpoints(canonicalSourceRefs(location.SourceRefs, sourceID)))
 	location.SourceRefs = locationResponseRefs(refs)
 	return order.EarliestValid(refs)
 }
--- a/internal/modules/dnd/extract/locationregistry/extractor.go
+++ b/internal/modules/dnd/extract/locationregistry/extractor.go
@@ -14,7 +14,7 @@ import (

 const (
 	Key           = "dnd/location-registry"
-	mappingPolicy = "dnd.location_registry.extract_mapping.v1"
+	mappingPolicy = "dnd.location_registry.extract_mapping.v2"
 )

 var requiredCapabilities = []string{"chunks", "source.transcript"}
--- a/internal/modules/dnd/extract/locationregistry/extractor_test.go
+++ b/internal/modules/dnd/extract/locationregistry/extractor_test.go
@@ -15,7 +15,7 @@ import (

 func TestExtractMapsLocationsWithOwnedEvidenceAndDeterministicOrder(t *testing.T) {
 	client := &fakeLocationsLLMClient{response: extractionResponse{Locations: []locationResponse{
-		{Name: "The Tavern", SourceRefs: responseSourceRefs(3, 3)},
+		{Name: "The Tavern", SourceRefs: responseSourceRefs(3, 2)},
 		{Name: "Old Mill", SourceRefs: []locationSourceRefResponse{{StartUnitID: 2, EndUnitID: 2}, {StartUnitID: 1, EndUnitID: 1}, {StartUnitID: 1, EndUnitID: 1}}},
 	}}}
 	result, err := newExtractor(t, client).Extract(context.Background(), extractionRequest())
@@ -25,7 +25,7 @@ func TestExtractMapsLocationsWithOwnedEvidenceAndDeterministicOrder(t *testing.T
 	refs := []source.SourceRef{{SourceID: "session-locations", StartUnitID: 1, EndUnitID: 1}, {SourceID: "session-locations", StartUnitID: 2, EndUnitID: 2}}
 	want := dnd.LocationRegistry{Locations: []dnd.Location{
 		{ID: identity.DeriveID("Old Mill", refs), Name: "Old Mill", SourceRefs: refs},
-		{ID: identity.DeriveID("The Tavern", []source.SourceRef{{SourceID: "session-locations", StartUnitID: 3, EndUnitID: 3}}), Name: "The Tavern", SourceRefs: []source.SourceRef{{SourceID: "session-locations", StartUnitID: 3, EndUnitID: 3}}},
+		{ID: identity.DeriveID("The Tavern", []source.SourceRef{{SourceID: "session-locations", StartUnitID: 2, EndUnitID: 3}}), Name: "The Tavern", SourceRefs: []source.SourceRef{{SourceID: "session-locations", StartUnitID: 2, EndUnitID: 3}}},
 	}}
 	if !reflect.DeepEqual(result.Value, want) {
 		t.Fatalf("Value = %#v, want %#v", result.Value, want)
--- a/internal/modules/dnd/extract/npcoccurrences/canonicalize.go
+++ b/internal/modules/dnd/extract/npcoccurrences/canonicalize.go
@@ -47,7 +47,7 @@ func canonicalizeOccurrence(occurrence *occurrenceResponse, order shared.SourceR
 	if occurrence == nil {
 		return 0, false
 	}
-	refs := order.Canonicalize(canonicalSourceRefs(occurrence.SourceRefs, sourceID))
+	refs := order.Canonicalize(order.OrderEndpoints(canonicalSourceRefs(occurrence.SourceRefs, sourceID)))
 	occurrence.SourceRefs = occurrenceResponseRefs(refs)
 	return order.EarliestValid(refs)
 }
--- a/internal/modules/dnd/extract/npcoccurrences/extractor.go
+++ b/internal/modules/dnd/extract/npcoccurrences/extractor.go
@@ -14,7 +14,7 @@ import (

 const (
 	Key           = "dnd/npc-occurrences"
-	mappingPolicy = "dnd.npc_occurrences.extract_mapping.v3"
+	mappingPolicy = "dnd.npc_occurrences.extract_mapping.v4"
 )

 const (
--- a/internal/modules/dnd/extract/npcoccurrences/extractor_test.go
+++ b/internal/modules/dnd/extract/npcoccurrences/extractor_test.go
@@ -22,7 +22,7 @@ func TestExtractMapsEveryKindAndOrdersBySourcePosition(t *testing.T) {
 		{Name: "Opponent", Kind: "combat_opponent", SourceRefs: occurrenceRefs(20, 20)},
 		{Name: "Ally", Kind: "combat_ally", SourceRefs: occurrenceRefs(5, 5)},
 		{Name: "Speaker", Kind: "dialogue", SourceRefs: append(occurrenceRefs(2, 2), occurrenceRefs(2, 2)...)},
-		{Name: "Present", Kind: "noncombat_presence", SourceRefs: occurrenceRefs(7, 7)},
+		{Name: "Present", Kind: "noncombat_presence", SourceRefs: occurrenceRefs(7, 2)},
 		{Name: "Mentioned", Kind: "mentioned", SourceRefs: occurrenceRefs(10, 10)},
 		{Name: "Invalid", Kind: "unsupported", SourceRefs: occurrenceRefs(0, 0)},
 	}}}
@@ -51,6 +51,9 @@ func TestExtractMapsEveryKindAndOrdersBySourcePosition(t *testing.T) {
 	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)
 	}
+	if refs := result.Value.Occurrences[2].SourceRefs; !reflect.DeepEqual(refs, []source.SourceRef{{SourceID: "session-alpha", StartUnitID: 2, EndUnitID: 7}}) {
+		t.Fatalf("reversed source refs = %#v", refs)
+	}
 	if id := result.Value.Occurrences[0].NPCID; id != identity.DeriveID("Mentioned") {
 		t.Fatalf("durable NPC ID = %q, want registry identity", id)
 	}
--- a/internal/modules/dnd/extract/npcregistry/canonicalize.go
+++ b/internal/modules/dnd/extract/npcregistry/canonicalize.go
@@ -46,7 +46,7 @@ func canonicalizeNPC(npc *npcResponse, order shared.SourceRefOrder, sourceID str
 	if npc == nil {
 		return 0, false
 	}
-	refs := order.Canonicalize(canonicalSourceRefs(npc.SourceRefs, sourceID))
+	refs := order.Canonicalize(order.OrderEndpoints(canonicalSourceRefs(npc.SourceRefs, sourceID)))
 	npc.SourceRefs = npcResponseRefs(refs)
 	return order.EarliestValid(refs)
 }
--- a/internal/modules/dnd/extract/npcregistry/extractor.go
+++ b/internal/modules/dnd/extract/npcregistry/extractor.go
@@ -13,7 +13,7 @@ import (

 const Key = "dnd/npc-registry"

-const mappingPolicy = "dnd.npc_registry.extract_mapping.v2"
+const mappingPolicy = "dnd.npc_registry.extract_mapping.v3"

 var requiredCapabilities = []string{
 	"chunks",
--- a/internal/modules/dnd/extract/npcregistry/extractor_test.go
+++ b/internal/modules/dnd/extract/npcregistry/extractor_test.go
@@ -16,7 +16,7 @@ import (
 func TestExtractReturnsCanonicalNPCRegistryFromPrivateResponse(t *testing.T) {
 	client := &fakeNPCsLLMClient{response: extractionResponse{NPCs: []npcResponse{
 		{
-			Name: "Captain Vale", SourceRefs: responseSourceRefs(3, 3),
+			Name: "Captain Vale", SourceRefs: responseSourceRefs(3, 2),
 		},
 		{
 			Name: "Mira Thorn",
@@ -34,7 +34,7 @@ func TestExtractReturnsCanonicalNPCRegistryFromPrivateResponse(t *testing.T) {
 	}
 	want := dnd.NPCRegistry{NPCs: []dnd.NPC{
 		{ID: identity.DeriveID("Mira Thorn"), Name: "Mira Thorn", SourceRefs: []source.SourceRef{{SourceID: "session-alpha", StartUnitID: 1, EndUnitID: 2}, {SourceID: "session-alpha", StartUnitID: 2, EndUnitID: 2}}},
-		{ID: identity.DeriveID("Captain Vale"), Name: "Captain Vale", SourceRefs: []source.SourceRef{{SourceID: "session-alpha", StartUnitID: 3, EndUnitID: 3}}},
+		{ID: identity.DeriveID("Captain Vale"), Name: "Captain Vale", SourceRefs: []source.SourceRef{{SourceID: "session-alpha", StartUnitID: 2, EndUnitID: 3}}},
 	}}
 	if !reflect.DeepEqual(result.Value, want) {
 		t.Fatalf("Value = %#v, want %#v", result.Value, want)
--- a/internal/modules/dnd/extract/spells/canonicalize.go
+++ b/internal/modules/dnd/extract/spells/canonicalize.go
@@ -45,7 +45,7 @@ func canonicalizeSpellCast(spell *spellCastResponse, order shared.SourceRefOrder
 	if spell == nil {
 		return 0, false
 	}
-	refs := order.Canonicalize(spellSourceRefs(spell.SourceRefs, sourceID))
+	refs := order.Canonicalize(order.OrderEndpoints(spellSourceRefs(spell.SourceRefs, sourceID)))
 	spell.SourceRefs = spellResponseRefs(refs)
 	return order.EarliestValid(refs)
 }
--- a/internal/modules/dnd/extract/spells/extractor.go
+++ b/internal/modules/dnd/extract/spells/extractor.go
@@ -16,7 +16,7 @@ import (
 const Key = "dnd/spells"
 const SchemaVersion = "v1"

-const mappingPolicy = "dnd.spells.extract_mapping.v2"
+const mappingPolicy = "dnd.spells.extract_mapping.v3"

 const (
 	NPCRegistryReferenceSlot = npcregistry.ReferenceSlot
--- a/internal/modules/dnd/extract/spells/extractor_test.go
+++ b/internal/modules/dnd/extract/spells/extractor_test.go
@@ -21,7 +21,7 @@ func TestExtractReturnsCanonicalSpellListFromPrivateResponse(t *testing.T) {
 		{
 			Caster:     " Aria ",
 			Spell:      " Cure Wounds ",
-			SourceRefs: responseSourceRefs(1, 2),
+			SourceRefs: responseSourceRefs(2, 1),
 		},
 	}}}
 	req := extractionRequest()