Move item occurrences to canonical namespace

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

@@ -1,4 +1,4 @@
-package itemevents
+package itemoccurrences
 
 import (
 	"sort"
@@ -42,12 +42,12 @@ func canonicalizeResponse(response *extractionResponse, order shared.SourceRefOr
 	}
 }
 
-func canonicalizeItemOccurrence(event *itemOccurrenceResponse, order shared.SourceRefOrder, sourceID string) (int, bool) {
-	if event == nil {
+func canonicalizeItemOccurrence(occurrence *itemOccurrenceResponse, order shared.SourceRefOrder, sourceID string) (int, bool) {
+	if occurrence == nil {
 		return 0, false
 	}
-	refs := order.Canonicalize(itemOccurrenceSourceRefs(event.SourceRefs, sourceID))
-	event.SourceRefs = itemOccurrenceResponseRefs(refs)
+	refs := order.Canonicalize(itemOccurrenceSourceRefs(occurrence.SourceRefs, sourceID))
+	occurrence.SourceRefs = itemOccurrenceResponseRefs(refs)
 	return order.EarliestValid(refs)
 }
 
@@ -56,19 +56,19 @@ func canonicalItemOccurrenceList(response extractionResponse, sourceID string, r
 		return dnd.ItemOccurrenceList{}
 	}
 	occurrences := make([]dnd.ItemOccurrence, 0, len(response.Occurrences))
-	for _, event := range response.Occurrences {
-		item, found := registry.LookupID(event.ItemID)
-		if !found || item.Name != event.Name {
+	for _, occurrence := range response.Occurrences {
+		item, found := registry.LookupID(occurrence.ItemID)
+		if !found || item.Name != occurrence.Name {
 			continue
 		}
 		occurrences = append(occurrences, dnd.ItemOccurrence{
-			ItemID:     event.ItemID,
-			Name:       event.Name,
-			Kind:       dnd.ItemOccurrenceKind(event.Kind),
-			Quantity:   cloneQuantity(event.Quantity),
-			From:       event.From,
-			To:         event.To,
-			SourceRefs: itemOccurrenceSourceRefs(event.SourceRefs, sourceID),
+			ItemID:     occurrence.ItemID,
+			Name:       occurrence.Name,
+			Kind:       dnd.ItemOccurrenceKind(occurrence.Kind),
+			Quantity:   cloneQuantity(occurrence.Quantity),
+			From:       occurrence.From,
+			To:         occurrence.To,
+			SourceRefs: itemOccurrenceSourceRefs(occurrence.SourceRefs, sourceID),
 		})
 	}
 	return dnd.ItemOccurrenceList{Occurrences: occurrences}

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

@@ -1,5 +1,5 @@
-// Package itemevents extracts source-grounded D&D item occurrences.
-package itemevents
+// Package itemoccurrences extracts source-grounded D&D item occurrences.
+package itemoccurrences
 
 import (
 	"context"
@@ -13,14 +13,14 @@ import (
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/shared"
 )
 
-const Key = "dnd/item-events"
+const Key = "dnd/item-occurrences"
 
 const (
 	ItemRegistryReferenceSlot = itemregistry.ReferenceSlot
 	ItemRegistryMaxBytes      = itemregistry.MaxBytes
 )
 
-const mappingPolicy = "dnd.item_events.extract_mapping.v1"
+const mappingPolicy = "dnd.item_occurrences.extract_mapping.v1"
 
 var requiredCapabilities = []string{
 	"chunks",
@@ -28,7 +28,7 @@ var requiredCapabilities = []string{
 }
 
 var providedCapabilities = []string{
-	"dnd.item_events",
+	"dnd.item_occurrences",
 }
 
 var referenceSlotDescriptions = shared.ReferenceSlotDescriptions{

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

@@ -1,4 +1,4 @@
-package itemevents
+package itemoccurrences
 
 import (
 	"context"

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

@@ -1,4 +1,4 @@
-package itemevents
+package itemoccurrences
 
 type extractionResponse struct {
 	Occurrences []itemOccurrenceResponse `json:"occurrences"`

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

@@ -1,4 +1,4 @@
-package itemevents
+package itemoccurrences
 
 import (
 	"fmt"
@@ -14,7 +14,7 @@ import (
 const promptAssetRoot = "assets/prompts"
 
 var promptAssetManifest = shared.PromptAssetManifest{
-	ModuleDir: "dnd.item_events",
+	ModuleDir: "dnd.item_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/item-events")
+	assets, err := fs.Sub(rootassets.FS(), "dnd/item-occurrences")
 	if err != nil {
-		return nil, fmt.Errorf("scope item-event assets: %w", err)
+		return nil, fmt.Errorf("scope item-occurrence assets: %w", err)
 	}
 	return assets, nil
 }
@@ -51,7 +51,7 @@ func RegisterPromptAssets(registry *llm.AssetRegistry) error {
 	}
 	schemas, err := fs.Sub(assets, "schemas")
 	if err != nil {
-		return fmt.Errorf("scope item-event schemas: %w", err)
+		return fmt.Errorf("scope item-occurrence schemas: %w", err)
 	}
 	return registry.RegisterSchemaFS(schemas, ".")
 }

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

@@ -1,4 +1,4 @@
-package itemevents
+package itemoccurrences
 
 import (
 	"context"
@@ -21,17 +21,17 @@ func TestPromptAssetsPrepareItemOccurrencePrompt(t *testing.T) {
 		t.Fatal(err)
 	}
 	options = append(options, promptkit.WithProfiles(promptkit.OpenAICompatibleProfile(promptkit.OpenAICompatibleProfileConfig{
-		ID: "item-events-test-profile", Endpoint: "http://127.0.0.1:1/v1", Model: "item-events-test-model",
+		ID: "item-occurrences-test-profile", Endpoint: "http://127.0.0.1:1/v1", Model: "item-occurrences-test-model",
 	})))
 	engine, err := promptkit.NewEngine(promptkit.Config{Timeout: time.Second}, options...)
 	if err != nil {
 		t.Fatal(err)
 	}
 	prepared, err := engine.Prepare(context.Background(), promptkit.RunRequest{
-		PromptID: PromptID, PromptVersion: SchemaVersion, ProfileID: "item-events-test-profile",
+		PromptID: PromptID, PromptVersion: SchemaVersion, ProfileID: "item-occurrences-test-profile",
 		Inputs: map[string]promptkit.ArtifactRef{
-			"transcript":    promptkit.InlineWithURI("file:///session.json", `{"units":[{"sentinel":"item-event-transcript"}]}`),
-			"players":       promptkit.Inline("item-event-player"),
+			"transcript":    promptkit.InlineWithURI("file:///session.json", `{"units":[{"sentinel":"item-occurrence-transcript"}]}`),
+			"players":       promptkit.Inline("item-occurrence-player"),
 			"party":         promptkit.Inline(" "),
 			"glossary":      promptkit.Inline(" "),
 			"item_registry": promptkit.Inline(`{"items":[{"id":"item:sha256:test","name":"Torch"}]}`),

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

@@ -1,4 +1,4 @@
-package itemevents
+package itemoccurrences
 
 import (
 	"reflect"

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

@@ -1,9 +1,9 @@
-package itemevents
+package itemoccurrences
 
 import "gitea.maximumdirect.net/eric/notarius/internal/framework/llm"
 
 const (
-	PromptID           = "dnd.item_events"
+	PromptID           = "dnd.item_occurrences"
 	ResponseSchemaKey  = llm.ResponseSchemaKey("dnd_item_occurrences_llm")
 	ResponseSchemaID   = "notarius.dnd.item_occurrences.llm"
 	ResponseSchemaName = "notarius_dnd_item_occurrences_llm_v1"

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

@@ -1,4 +1,4 @@
-package itemevents
+package itemoccurrences
 
 import (
 	"bytes"
@@ -39,11 +39,11 @@ func TestResponseSchemaIsStrictlyStructuralAndPrivate(t *testing.T) {
 		value map[string]any
 	}{
 		{"missing occurrences", map[string]any{}},
-		{"missing event name", map[string]any{"occurrences": []any{withoutField(responseEvent(), "name")}}},
-		{"missing nullable field", map[string]any{"occurrences": []any{withoutField(responseEvent(), "quantity")}}},
-		{"unknown event field", map[string]any{"occurrences": []any{withField(responseEvent(), "extra", true)}}},
-		{"unknown reference field", map[string]any{"occurrences": []any{withField(responseEvent(), "source_refs", []any{map[string]any{"start_segment": 1, "end_segment": 1, "extra": true}})}}},
-		{"noninteger range", map[string]any{"occurrences": []any{withField(responseEvent(), "source_refs", []any{map[string]any{"start_segment": 1.5, "end_segment": 1}})}}},
+		{"missing occurrence name", map[string]any{"occurrences": []any{withoutField(responseOccurrence(), "name")}}},
+		{"missing nullable field", map[string]any{"occurrences": []any{withoutField(responseOccurrence(), "quantity")}}},
+		{"unknown occurrence field", map[string]any{"occurrences": []any{withField(responseOccurrence(), "extra", true)}}},
+		{"unknown reference field", map[string]any{"occurrences": []any{withField(responseOccurrence(), "source_refs", []any{map[string]any{"start_segment": 1, "end_segment": 1, "extra": true}})}}},
+		{"noninteger range", map[string]any{"occurrences": []any{withField(responseOccurrence(), "source_refs", []any{map[string]any{"start_segment": 1.5, "end_segment": 1}})}}},
 	} {
 		t.Run(test.name, func(t *testing.T) {
 			content, err := json.Marshal(test.value)
@@ -66,7 +66,7 @@ func TestResponseSchemaIsStrictlyStructuralAndPrivate(t *testing.T) {
 	}
 }
 
-func responseEvent() map[string]any {
+func responseOccurrence() map[string]any {
 	return map[string]any{
 		"item_id": "item:sha256:test", "name": "Ring", "kind": "acquired", "quantity": nil, "from": nil, "to": "party", "source_refs": []any{},
 	}

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

@@ -1,4 +1,4 @@
-package itemevents
+package itemoccurrences
 
 import (
 	"context"
@@ -26,7 +26,7 @@ func extractionRequest() contracts.TypedExtractionRequest {
 		Chunk:       chunk,
 		SourceInput: contracts.NewLLMInputMaterial("source", chunk.MediaType, chunk.Content, "sha256:chunk", "file:///session-alpha.json"),
 		SessionID:   "session-123",
-		LLMProfile:  "profile-item-events",
+		LLMProfile:  "profile-item-occurrences",
 	}
 }