Move location registry modules to canonical namespace

internal/modules/dnd/codec/locationregistry/codec.go

@@ -1,5 +1,5 @@
-// Package locations encodes durable D&D location artifacts.
-package locations
+// Package locationregistry encodes durable D&D location-registry artifacts.
+package locationregistry
 
 import (
 	"embed"

internal/modules/dnd/codec/locationregistry/codec_test.go

@@ -1,4 +1,4 @@
-package locations
+package locationregistry
 
 import (
 	"bytes"

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

@@ -12,7 +12,7 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd"
-	locationcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/locations"
+	locationcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/locationregistry"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/locations/identity"
 )
 

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

@@ -30,7 +30,7 @@ func TestRegisterPromptAssetsPreparesLocationOccurrencePrompt(t *testing.T) {
 		PromptID: PromptID, PromptVersion: SchemaVersion, ProfileID: "location-occurrences-test",
 		Inputs: map[string]promptkit.ArtifactRef{
 			"transcript": promptkit.Inline(`{"units":[{"sentinel":"location-occurrence-transcript"}]}`), "players": promptkit.Inline("location-occurrence-player"), "party": promptkit.Inline(" "), "glossary": promptkit.Inline(" "),
-			"locations": promptkit.Inline(`{"locations":[{"id":"location:sha256:test","name":"location-occurrence-registry"}]}`),
+			"location_registry": promptkit.Inline(`{"locations":[{"id":"location:sha256:test","name":"location-occurrence-registry"}]}`),
 		},
 	})
 	if err != nil {
@@ -48,4 +48,13 @@ func TestRegisterPromptAssetsPreparesLocationOccurrencePrompt(t *testing.T) {
 	if !strings.Contains(registryMessage, "location:sha256:test") || !strings.Contains(registryMessage, "location-occurrence-registry") || strings.Contains(registryMessage, "source_refs") {
 		t.Fatalf("rendered prompt did not preserve source-free registry grounding: %s", registryMessage)
 	}
+	content := make([]string, len(prepared.Messages))
+	for index, message := range prepared.Messages {
+		content[index] = message.Content
+	}
+	rendered := strings.Join(content, "\n")
+	policy := strings.ReplaceAll(rendered, "\n", " ")
+	if !strings.Contains(policy, "context supports that coreference") || !strings.Contains(policy, "must not create a registry location") || !strings.Contains(policy, "provenance must never replace current-chunk evidence") {
+		t.Fatalf("rendered prompt = %q, want contextual coreference without registry-derived evidence", rendered)
+	}
 }

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

@@ -1,4 +1,4 @@
-package locations
+package locationregistry
 
 import (
 	"sort"

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

@@ -1,5 +1,5 @@
-// Package locations extracts source-grounded D&D physical location candidates.
-package locations
+// Package locationregistry extracts source-grounded D&D location-registry candidates.
+package locationregistry
 
 import (
 	"context"
@@ -13,12 +13,12 @@ import (
 )
 
 const (
-	Key           = "dnd/locations"
-	mappingPolicy = "dnd.locations.extract_mapping.v1"
+	Key           = "dnd/location-registry"
+	mappingPolicy = "dnd.location_registry.extract_mapping.v1"
 )
 
 var requiredCapabilities = []string{"chunks", "source.transcript"}
-var providedCapabilities = []string{"dnd.locations"}
+var providedCapabilities = []string{"dnd.location_registry"}
 
 var referenceSlotDescriptions = shared.ReferenceSlotDescriptions{
 	Glossary: "Optional campaign glossary reference material used only for location disambiguation.",
@@ -148,5 +148,5 @@ func DecodeOptions(options map[string]any) (Options, error) {
 }
 
 func extractorErrorf(format string, args ...any) error {
-	return fmt.Errorf("dnd locations extractor: "+format, args...)
+	return fmt.Errorf("dnd location registry extractor: "+format, args...)
 }

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

@@ -1,4 +1,4 @@
-package locations
+package locationregistry
 
 import (
 	"context"
@@ -113,13 +113,13 @@ func TestExtractHandlesEmptyOutputAndLocalFailures(t *testing.T) {
 		{name: "preflight", extractor: newExtractor(t, &fakeLocationsLLMClient{}), req: mismatchedSourceInputRequest(request), want: "must match chunk"},
 	} {
 		t.Run(test.name, func(t *testing.T) {
-			if _, err := test.extractor.Extract(context.Background(), test.req); err == nil || !strings.Contains(err.Error(), "dnd locations") || !strings.Contains(err.Error(), test.want) {
+			if _, err := test.extractor.Extract(context.Background(), test.req); err == nil || !strings.Contains(err.Error(), "dnd location registry") || !strings.Contains(err.Error(), test.want) {
 				t.Fatalf("Extract() error = %v, want local context", err)
 			}
 		})
 	}
 	_, err = newExtractor(t, &fakeLocationsLLMClient{err: errors.New("provider unavailable")}).Extract(context.Background(), request)
-	if err == nil || !strings.Contains(err.Error(), "dnd locations") || !strings.Contains(err.Error(), "provider unavailable") {
+	if err == nil || !strings.Contains(err.Error(), "dnd location registry") || !strings.Contains(err.Error(), "provider unavailable") {
 		t.Fatalf("provider error = %v, want contextual provider error", err)
 	}
 }

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

@@ -1,4 +1,4 @@
-package locations
+package locationregistry
 
 type extractionResponse struct {
 	Locations []locationResponse `json:"locations"`

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

@@ -1,4 +1,4 @@
-package locations
+package locationregistry
 
 import (
 	"fmt"
@@ -29,7 +29,7 @@ var promptAssetManifest = shared.PromptAssetManifest{
 }
 
 func moduleAssetFS() (fs.FS, error) {
-	assets, err := fs.Sub(rootassets.FS(), "dnd/locations/extract")
+	assets, err := fs.Sub(rootassets.FS(), "dnd/location-registry/extract")
 	if err != nil {
 		return nil, fmt.Errorf("scope location extraction assets: %w", err)
 	}

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

@@ -1,7 +1,8 @@
-package locations
+package locationregistry
 
 import (
 	"context"
+	"strings"
 	"testing"
 	"time"
 
@@ -29,7 +30,15 @@ func TestRegisterPromptAssetsPreparesLocationPrompt(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Prepare() error = %v", err)
 	}
-	if prepared.PromptID != PromptID || prepared.OutputContract.SchemaPath != "dnd_locations_llm.v1.json" {
+	if prepared.PromptID != PromptID || prepared.OutputContract.SchemaPath != "dnd_location_registry_llm.v1.json" {
 		t.Fatalf("prepared prompt = %#v, want location prompt identity and schema wiring", prepared)
 	}
+	content := make([]string, len(prepared.Messages))
+	for index, message := range prepared.Messages {
+		content[index] = message.Content
+	}
+	rendered := strings.Join(content, "\n")
+	if !strings.Contains(rendered, "stable proper name or unique in-world designation") || !strings.Contains(rendered, "the room") || !strings.Contains(rendered, "Do not use capitalization as an eligibility test") {
+		t.Fatalf("rendered prompt = %q, want named-or-unique location eligibility rules", rendered)
+	}
 }

internal/modules/dnd/extract/locationregistry/registry_test.go

@@ -1,4 +1,4 @@
-package locations
+package locationregistry
 
 import (
 	"reflect"
@@ -18,7 +18,7 @@ func TestModuleRegistrationAndMetadata(t *testing.T) {
 	if _, err := New(&fakeLocationsLLMClient{}, Options{}, contracts.ReferenceSet{}, contracts.ReferenceSet{}); err == nil || !strings.Contains(err.Error(), "at most one") {
 		t.Fatalf("New() error = %v, want reference-set rejection", err)
 	}
-	want := pipeline.ModuleSpec{Key: Key, Stage: pipeline.StageExtract, ExecutionClass: contracts.ExecutionClassLLMBacked, Requires: []string{"chunks", "source.transcript"}, Provides: []string{"dnd.locations"}, ArtifactKind: dnd.LocationRegistryKind, ReferenceSlots: referenceSlots()}
+	want := pipeline.ModuleSpec{Key: Key, Stage: pipeline.StageExtract, ExecutionClass: contracts.ExecutionClassLLMBacked, Requires: []string{"chunks", "source.transcript"}, Provides: []string{"dnd.location_registry"}, ArtifactKind: dnd.LocationRegistryKind, ReferenceSlots: referenceSlots()}
 	if got := ModuleSpec(); !reflect.DeepEqual(got, want) {
 		t.Fatalf("ModuleSpec() = %#v, want %#v", got, want)
 	}

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

@@ -1,12 +1,12 @@
-package locations
+package locationregistry
 
 import "gitea.maximumdirect.net/eric/notarius/internal/framework/llm"
 
 const (
-	PromptID           = "dnd.locations"
-	ResponseSchemaKey  = llm.ResponseSchemaKey("dnd_locations_llm")
-	ResponseSchemaID   = "notarius.dnd.locations.llm"
-	ResponseSchemaName = "notarius_dnd_locations_llm_v1"
+	PromptID           = "dnd.location_registry"
+	ResponseSchemaKey  = llm.ResponseSchemaKey("dnd_location_registry_llm")
+	ResponseSchemaID   = "notarius.dnd.location_registry.llm"
+	ResponseSchemaName = "notarius_dnd_location_registry_llm_v1"
 	SchemaVersion      = "v1"
 )
 
@@ -20,6 +20,6 @@ func loadResponseSchema() (llm.ResponseSchema, error) {
 		ID:        ResponseSchemaID,
 		Version:   SchemaVersion,
 		Name:      ResponseSchemaName,
-		AssetPath: "schemas/dnd_locations_llm.v1.json",
+		AssetPath: "schemas/dnd_location_registry_llm.v1.json",
 	})
 }

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

@@ -1,4 +1,4 @@
-package locations
+package locationregistry
 
 import (
 	"encoding/json"

internal/modules/dnd/extract/locationregistry/test_helpers_test.go

@@ -1,4 +1,4 @@
-package locations
+package locationregistry
 
 import (
 	"context"

internal/modules/dnd/locations/registry/registry.go

@@ -11,14 +11,14 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/core/source"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd"
-	locationcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/locations"
+	locationcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/locationregistry"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/locations/identity"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/shared/diagnostics"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/shared/registryresolver"
 )
 
 const (
-	ReferenceSlot = "locations"
+	ReferenceSlot = "location_registry"
 	MaxBytes      = 1048576
 	emptyPrompt   = `{"locations":[]}`
 )
@@ -59,7 +59,7 @@ func (r *Resolver) Seeded() *Registry {
 	return r.resolver.Seeded()
 }
 
-// Resolve returns the generated operation-time registry when the locations
+// Resolve returns the generated operation-time registry when the location_registry
 // slot is present, otherwise it returns the construction-time registry.
 func (r *Resolver) Resolve(references contracts.ReferenceSet) (*Registry, error) {
 	if r == nil || r.resolver == nil {

internal/modules/dnd/locations/registry/registry_test.go

@@ -8,7 +8,7 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/core/source"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd"
-	locationcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/locations"
+	locationcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/locationregistry"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/locations/identity"
 )
 

internal/modules/dnd/normalize/locationoccurrences/normalizer_test.go

@@ -10,7 +10,7 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd"
-	locationcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/locations"
+	locationcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/locationregistry"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/locations/identity"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/shared/diagnostics"
 )

internal/modules/dnd/normalize/locationregistry/normalizer.go

@@ -1,5 +1,5 @@
-// Package locations normalizes merged D&D location candidates conservatively.
-package locations
+// Package locationregistry normalizes merged D&D location-registry candidates conservatively.
+package locationregistry
 
 import (
 	"context"
@@ -21,9 +21,9 @@ import (
 )
 
 const (
-	Key                   = "dnd/locations"
-	PromptID              = "dnd.locations.normalize"
-	normalizationPolicy   = "dnd.locations.normalize.v1"
+	Key                   = "dnd/location-registry"
+	PromptID              = "dnd.location_registry.normalize"
+	normalizationPolicy   = "dnd.location_registry.normalize.v1"
 	semanticContextPolicy = "dnd.entity_reconcile.context.v1"
 	semanticContextRadius = 2
 	NormalizationPolicy   = normalizationPolicy
@@ -339,5 +339,5 @@ func DecodeOptions(options map[string]any) (Options, error) {
 	return Options{}, nil
 }
 func normalizerErrorf(format string, args ...any) error {
-	return fmt.Errorf("dnd locations normalizer: "+format, args...)
+	return fmt.Errorf("dnd location registry normalizer: "+format, args...)
 }

internal/modules/dnd/normalize/locationregistry/normalizer_test.go

@@ -1,4 +1,4 @@
-package locations
+package locationregistry
 
 import (
 	"context"

internal/modules/dnd/normalize/locationregistry/prompt_assets.go

@@ -1,4 +1,4 @@
-package locations
+package locationregistry
 
 import (
 	"fmt"
@@ -24,7 +24,7 @@ var promptAssetManifest = shared.PromptAssetManifest{
 }
 
 func moduleAssetFS() (fs.FS, error) {
-	assets, err := fs.Sub(rootassets.FS(), "dnd/locations/normalize")
+	assets, err := fs.Sub(rootassets.FS(), "dnd/location-registry/normalize")
 	if err != nil {
 		return nil, fmt.Errorf("scope location normalization assets: %w", err)
 	}

internal/modules/dnd/normalize/locationregistry/prompt_assets_test.go

@@ -1,4 +1,4 @@
-package locations
+package locationregistry
 
 import (
 	"context"

internal/modules/dnd/normalize/locationregistry/reconciliation.go

@@ -1,4 +1,4 @@
-package locations
+package locationregistry
 
 import (
 	"fmt"

internal/modules/dnd/normalize/locationregistry/test_helpers_test.go

@@ -1,4 +1,4 @@
-package locations
+package locationregistry
 
 import (
 	"context"

internal/modules/dnd/register/chains.go

@@ -6,7 +6,7 @@ import (
 	enemyeventextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/enemyevents"
 	itemeventextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/itemevents"
 	locationoccurrenceextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/locationoccurrences"
-	locationextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/locations"
+	locationextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/locationregistry"
 	occurrenceextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/npcoccurrences"
 	npcextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/npcregistry"
 	scenedescriptionextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/scenedescriptions"
@@ -15,7 +15,7 @@ import (
 	enemyeventnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/enemyevents"
 	itemeventnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/itemevents"
 	locationoccurrencenormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/locationoccurrences"
-	locationnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/locations"
+	locationnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/locationregistry"
 	occurrencenormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/npcoccurrences"
 	npcnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/npcregistry"
 	scenedescriptionnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/scenedescriptions"
@@ -38,10 +38,10 @@ import (
 	locationoccurrenceshape "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationoccurrences/shape"
 	locationoccurrencerefs "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationoccurrences/source_refs"
 	locationoccurrencerelatedness "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationoccurrences/source_relatedness"
-	locationidentity "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locations/identity"
-	locationshape "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locations/shape"
-	locationrefs "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locations/source_refs"
-	locationrelatedness "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locations/source_relatedness"
+	locationidentity "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationregistry/identity"
+	locationshape "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationregistry/shape"
+	locationrefs "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationregistry/source_refs"
+	locationrelatedness "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationregistry/source_relatedness"
 	npcoccurrenceinvariants "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/npcoccurrences/invariants"
 	npcoccurrenceregistry "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/npcoccurrences/registry"
 	npcoccurrenceshape "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/npcoccurrences/shape"

internal/modules/dnd/register/modules.go

@@ -9,7 +9,7 @@ import (
 	enemyeventcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/enemyevents"
 	itemeventcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/itemevents"
 	locationoccurrencecodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/locationoccurrences"
-	locationcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/locations"
+	locationcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/locationregistry"
 	occurrencecodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/npcoccurrences"
 	npccodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/npcregistry"
 	scenedescriptioncodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/scenedescriptions"
@@ -18,7 +18,7 @@ import (
 	enemyeventextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/enemyevents"
 	itemeventextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/itemevents"
 	locationoccurrenceextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/locationoccurrences"
-	locationextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/locations"
+	locationextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/locationregistry"
 	occurrenceextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/npcoccurrences"
 	npcextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/npcregistry"
 	scenedescriptionextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/scenedescriptions"
@@ -27,7 +27,7 @@ import (
 	enemyeventnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/enemyevents"
 	itemeventnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/itemevents"
 	locationoccurrencenormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/locationoccurrences"
-	locationnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/locations"
+	locationnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/locationregistry"
 	occurrencenormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/npcoccurrences"
 	npcnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/npcregistry"
 	scenedescriptionnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/scenedescriptions"
@@ -49,7 +49,7 @@ func registerModules(registries pipeline.Registries) error {
 		{name: "scene descriptions codec", register: func() error {
 			return pipeline.RegisterArtifactCodec(registries.ArtifactCodecs, scenedescriptioncodec.New())
 		}},
-		{name: "locations codec", register: func() error { return pipeline.RegisterArtifactCodec(registries.ArtifactCodecs, locationcodec.New()) }},
+		{name: "location registry codec", register: func() error { return pipeline.RegisterArtifactCodec(registries.ArtifactCodecs, locationcodec.New()) }},
 		{name: "location occurrences codec", register: func() error {
 			return pipeline.RegisterArtifactCodec(registries.ArtifactCodecs, locationoccurrencecodec.New())
 		}},
@@ -61,7 +61,7 @@ func registerModules(registries pipeline.Registries) error {
 		{name: "item events extractor", register: func() error { return itemeventextract.Register(registries.Extractors) }},
 		{name: "npc occurrences extractor", register: func() error { return occurrenceextract.Register(registries.Extractors) }},
 		{name: "scene descriptions extractor", register: func() error { return scenedescriptionextract.Register(registries.Extractors) }},
-		{name: "locations extractor", register: func() error { return locationextract.Register(registries.Extractors) }},
+		{name: "location registry extractor", register: func() error { return locationextract.Register(registries.Extractors) }},
 		{name: "location occurrences extractor", register: func() error { return locationoccurrenceextract.Register(registries.Extractors) }},
 		{name: "spell-list appendorder merger", register: func() error {
 			return appendorder.RegisterTyped(registries.Mergers, dnd.SpellListKind, appendSpellLists)
@@ -97,7 +97,7 @@ func registerModules(registries pipeline.Registries) error {
 		{name: "item events normalizer", register: func() error { return itemeventnormalize.Register(registries.Normalizers) }},
 		{name: "npc occurrences normalizer", register: func() error { return occurrencenormalize.Register(registries.Normalizers) }},
 		{name: "scene descriptions normalizer", register: func() error { return scenedescriptionnormalize.Register(registries.Normalizers) }},
-		{name: "locations normalizer", register: func() error { return locationnormalize.Register(registries.Normalizers) }},
+		{name: "location registry normalizer", register: func() error { return locationnormalize.Register(registries.Normalizers) }},
 		{name: "location occurrences normalizer", register: func() error { return locationoccurrencenormalize.Register(registries.Normalizers) }},
 		{name: "spell-list noop normalizer", register: func() error {
 			return noop.RegisterTyped[dnd.SpellList](registries.Normalizers, dnd.SpellListKind)

internal/modules/dnd/register/prompt_cache_test.go

@@ -12,7 +12,7 @@ import (
 	enemyeventextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/enemyevents"
 	itemeventextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/itemevents"
 	locationoccurrenceextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/locationoccurrences"
-	locationextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/locations"
+	locationextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/locationregistry"
 	occurrenceextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/npcoccurrences"
 	npcextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/npcregistry"
 	scenedescriptionextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/scenedescriptions"
@@ -90,7 +90,7 @@ func TestExtractionPromptComposition(t *testing.T) {
 			promptID:      locationoccurrenceextract.PromptID,
 			promptVersion: locationoccurrenceextract.SchemaVersion,
 			inputs: withPromptInputs(commonInputs, map[string]promptkit.ArtifactRef{
-				"locations": promptkit.Inline(`{"sentinel":"location-registry-sentinel"}`),
+				"location_registry": promptkit.Inline(`{"sentinel":"location-registry-sentinel"}`),
 			}),
 			suffixGroups: [][]string{{evidenceSentinel}, {"location-registry-sentinel"}},
 		},

internal/modules/dnd/register/register_test.go

@@ -16,7 +16,7 @@ import (
 	enemyeventextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/enemyevents"
 	itemeventextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/itemevents"
 	locationoccurrenceextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/locationoccurrences"
-	locationextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/locations"
+	locationextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/locationregistry"
 	occurrenceextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/npcoccurrences"
 	npcextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/npcregistry"
 	scenedescriptionextract "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/extract/scenedescriptions"
@@ -25,7 +25,7 @@ import (
 	enemyeventnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/enemyevents"
 	itemeventnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/itemevents"
 	locationoccurrencenormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/locationoccurrences"
-	locationnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/locations"
+	locationnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/locationregistry"
 	occurrencenormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/npcoccurrences"
 	npcnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/npcregistry"
 	scenedescriptionnormalize "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/normalize/scenedescriptions"
@@ -55,8 +55,8 @@ func TestRegisterAddsDNDFamily(t *testing.T) {
 		"dnd.npc_occurrences/prompt.yaml",
 		"dnd.scene_descriptions/prompt.yaml",
 		"dnd.npc_registry.normalize/prompt.yaml",
-		"dnd.locations/prompt.yaml",
-		"dnd.locations.normalize/prompt.yaml",
+		"dnd.location_registry/prompt.yaml",
+		"dnd.location_registry.normalize/prompt.yaml",
 		"dnd.location_occurrences/prompt.yaml",
 	} {
 		content, err := fs.ReadFile(promptFS, name)
@@ -95,7 +95,7 @@ func TestRegisterAddsDNDFamily(t *testing.T) {
 	assertContainsArtifactKinds(t, registries.Normalizers.RegisteredArtifactKinds(occurrencenormalize.Key), []contracts.ArtifactKind{dnd.NPCOccurrenceListKind})
 	assertContainsArtifactKinds(t, registries.Normalizers.RegisteredArtifactKinds(scenedescriptionnormalize.Key), []contracts.ArtifactKind{dnd.SceneDescriptionListKind})
 	assertContainsKeys(t, "validators", registries.Validators.RegisteredKeys(), []string{
-		"extract/dnd/locations/shape", "normalize/dnd/locations/identity", "extract/dnd/locations/source_refs", "extract/dnd/locations/source_relatedness",
+		"extract/dnd/location-registry/shape", "normalize/dnd/location-registry/identity", "extract/dnd/location-registry/source_refs", "extract/dnd/location-registry/source_relatedness",
 		"extract/dnd/location-occurrences/shape", "extract/dnd/location-occurrences/registry", "normalize/dnd/location-occurrences/invariants", "extract/dnd/location-occurrences/source_refs", "extract/dnd/location-occurrences/source_relatedness",
 		"extract/dnd/npc-registry/shape",
 		"extract/dnd/npc-registry/source_refs",
@@ -130,8 +130,8 @@ func TestRegisterAddsDNDFamily(t *testing.T) {
 		"generic/always_accept",
 		"generic/always_reject",
 	})
-	locationExtractChain := []pipeline.ModuleBinding{pipeline.Binding("generic/valid_json"), pipeline.Binding("extract/dnd/locations/shape"), pipeline.Binding("extract/dnd/locations/source_refs"), pipeline.Binding("generic/valid_json_schema"), pipeline.Binding("extract/dnd/locations/source_relatedness")}
-	locationNormalizeChain := []pipeline.ModuleBinding{pipeline.Binding("generic/valid_json"), pipeline.Binding("extract/dnd/locations/shape"), pipeline.Binding("normalize/dnd/locations/identity"), pipeline.Binding("extract/dnd/locations/source_refs"), pipeline.Binding("generic/valid_json_schema"), pipeline.Binding("extract/dnd/locations/source_relatedness")}
+	locationExtractChain := []pipeline.ModuleBinding{pipeline.Binding("generic/valid_json"), pipeline.Binding("extract/dnd/location-registry/shape"), pipeline.Binding("extract/dnd/location-registry/source_refs"), pipeline.Binding("generic/valid_json_schema"), pipeline.Binding("extract/dnd/location-registry/source_relatedness")}
+	locationNormalizeChain := []pipeline.ModuleBinding{pipeline.Binding("generic/valid_json"), pipeline.Binding("extract/dnd/location-registry/shape"), pipeline.Binding("normalize/dnd/location-registry/identity"), pipeline.Binding("extract/dnd/location-registry/source_refs"), pipeline.Binding("generic/valid_json_schema"), pipeline.Binding("extract/dnd/location-registry/source_relatedness")}
 	occurrenceExtractChain := []pipeline.ModuleBinding{pipeline.Binding("generic/valid_json"), pipeline.Binding("extract/dnd/location-occurrences/shape"), pipeline.Binding("extract/dnd/location-occurrences/registry"), pipeline.Binding("extract/dnd/location-occurrences/source_refs"), pipeline.Binding("generic/valid_json_schema"), pipeline.Binding("extract/dnd/location-occurrences/source_relatedness")}
 	occurrenceNormalizeChain := []pipeline.ModuleBinding{pipeline.Binding("generic/valid_json"), pipeline.Binding("extract/dnd/location-occurrences/shape"), pipeline.Binding("extract/dnd/location-occurrences/registry"), pipeline.Binding("normalize/dnd/location-occurrences/invariants"), pipeline.Binding("extract/dnd/location-occurrences/source_refs"), pipeline.Binding("generic/valid_json_schema"), pipeline.Binding("extract/dnd/location-occurrences/source_relatedness")}
 	for _, test := range []struct {
@@ -304,7 +304,7 @@ func TestRegisterAddsDNDFamily(t *testing.T) {
 		"dnd_item_events_llm.v1.json",
 		"dnd_npc_occurrences_llm.v1.json",
 		"dnd_scene_descriptions_llm.v1.json",
-		"dnd_locations_llm.v1.json",
+		"dnd_location_registry_llm.v1.json",
 		"dnd_location_occurrences_llm.v1.json",
 	})
 	if spec, ok := registries.Chunkers.Spec("dnd/scenes"); !ok || spec.Key != "dnd/scenes" {
@@ -366,8 +366,8 @@ func TestRegisterAddsDNDFamily(t *testing.T) {
 	if !locationOccurrenceExtractOK || locationOccurrenceExtractSpec.ArtifactKind != dnd.LocationOccurrenceListKind || locationOccurrenceExtractSpec.ExecutionClass != contracts.ExecutionClassLLMBacked || !locationOccurrenceNormalizeOK || locationOccurrenceNormalizeSpec.ArtifactKind != dnd.LocationOccurrenceListKind || locationOccurrenceNormalizeSpec.ExecutionClass != contracts.ExecutionClassDeterministic {
 		t.Fatalf("location occurrence specs = %#v / %#v", locationOccurrenceExtractSpec, locationOccurrenceNormalizeSpec)
 	}
-	locationRegistrySlot := referenceSlot(locationOccurrenceExtractSpec.ReferenceSlots, "locations")
-	occurrenceNormalizeRegistrySlot := referenceSlot(locationOccurrenceNormalizeSpec.ReferenceSlots, "locations")
+	locationRegistrySlot := referenceSlot(locationOccurrenceExtractSpec.ReferenceSlots, "location_registry")
+	occurrenceNormalizeRegistrySlot := referenceSlot(locationOccurrenceNormalizeSpec.ReferenceSlots, "location_registry")
 	if len(locationOccurrenceExtractSpec.ReferenceSlots) != 5 || len(locationOccurrenceNormalizeSpec.ReferenceSlots) != 1 {
 		t.Fatalf("location occurrence reference slots = %#v / %#v, want extractor campaign context and normalizer registry only", locationOccurrenceExtractSpec.ReferenceSlots, locationOccurrenceNormalizeSpec.ReferenceSlots)
 	}

internal/modules/dnd/register/validators.go

@@ -21,10 +21,10 @@ import (
 	locationoccurrenceshape "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationoccurrences/shape"
 	locationoccurrencerefs "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationoccurrences/source_refs"
 	locationoccurrencerelatedness "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationoccurrences/source_relatedness"
-	locationidentity "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locations/identity"
-	locationshape "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locations/shape"
-	locationrefs "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locations/source_refs"
-	locationrelatedness "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locations/source_relatedness"
+	locationidentity "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationregistry/identity"
+	locationshape "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationregistry/shape"
+	locationrefs "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationregistry/source_refs"
+	locationrelatedness "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationregistry/source_relatedness"
 	npcoccurrenceinvariants "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/npcoccurrences/invariants"
 	npcoccurrenceregistry "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/npcoccurrences/registry"
 	npcoccurrenceshape "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/npcoccurrences/shape"

internal/modules/dnd/validate/locationoccurrences/registry/validator_test.go

@@ -11,7 +11,7 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/contracts"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/pipeline"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd"
-	locationcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/locations"
+	locationcodec "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/codec/locationregistry"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/locations/identity"
 	locationregistry "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/locations/registry"
 )

internal/modules/dnd/validate/locationregistry/identity/validator.go

@@ -10,11 +10,11 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd"
 	domainidentity "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/locations/identity"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/shared/diagnostics"
-	locationshape "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locations/shape"
+	locationshape "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationregistry/shape"
 )
 
 const (
-	Key        = "normalize/dnd/locations/identity"
+	Key        = "normalize/dnd/location-registry/identity"
 	ReasonCode = "invalid_location_identity"
 	policy     = domainidentity.Policy
 )

internal/modules/dnd/validate/locationregistry/shape/validator.go

@@ -13,9 +13,9 @@ import (
 )
 
 const (
-	Key        = "extract/dnd/locations/shape"
+	Key        = "extract/dnd/location-registry/shape"
 	ReasonCode = "invalid_location_shape"
-	policy     = "dnd.locations.validator.shape.v1"
+	policy     = "dnd.location_registry.validator.shape.v1"
 )
 
 type Options struct{}

internal/modules/dnd/validate/locationregistry/source_refs/validator.go

@@ -10,13 +10,13 @@ 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/shared/diagnostics"
-	locationshape "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locations/shape"
+	locationshape "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationregistry/shape"
 )
 
 const (
-	Key        = "extract/dnd/locations/source_refs"
+	Key        = "extract/dnd/location-registry/source_refs"
 	ReasonCode = "invalid_location_source_refs"
-	policy     = "dnd.locations.validator.source_refs.v2"
+	policy     = "dnd.location_registry.validator.source_refs.v2"
 )
 
 type Options struct{}

internal/modules/dnd/validate/locationregistry/source_relatedness/validator.go

@@ -10,14 +10,14 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/shared"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/shared/diagnostics"
-	locationshape "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locations/shape"
+	locationshape "gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/validate/locationregistry/shape"
 )
 
 const (
-	Key               = "extract/dnd/locations/source_relatedness"
+	Key               = "extract/dnd/location-registry/source_relatedness"
 	WarningReasonCode = "location_not_near_source"
 	OmittedReasonCode = "location_relatedness_warnings_omitted"
-	policy            = "dnd.locations.validator.source_relatedness.v2"
+	policy            = "dnd.location_registry.validator.source_relatedness.v2"
 )
 
 type Options struct{}