Centralize item and enemy event assets

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

@@ -1,6 +0,0 @@
-package enemyevents
-
-import "embed"
-
-//go:embed assets/schemas/dnd_enemy_events_llm.v1.json assets/prompts/*.yaml assets/prompts/*.md
-var embeddedAssets embed.FS

internal/modules/dnd/extract/enemyevents/assets/prompts/dnd.enemy_events.yaml

@@ -1,55 +0,0 @@
-id: dnd.enemy_events
-version: "v1"
-default_profile: dnd-extraction
-inputs:
-  - name: transcript
-    required: true
-    content_type: application/json
-  - name: players
-    required: false
-    content_type: text/plain
-  - name: party
-    required: false
-    content_type: text/plain
-  - name: glossary
-    required: false
-    content_type: text/plain
-  - name: npcs
-    required: true
-    content_type: application/json
-  - name: combat_turns
-    required: true
-    content_type: application/json
-  - name: npc_interactions
-    required: true
-    content_type: application/json
-messages:
-  - role: system
-    content_file: ./sharedassets/common-dnd-system.md
-  - role: user
-    content_file: ./sharedassets/common-dnd-identity.md
-  - role: user
-    content_file: ./sharedassets/common-dnd-references.md
-    cache_control:
-      type: ephemeral
-  - role: user
-    content_file: ./sharedassets/common-dnd-transcript.md
-    cache_control:
-      type: ephemeral
-  - role: user
-    content_file: ./sharedassets/common-dnd-extraction-evidence.md
-  - role: user
-    content_file: ./sharedassets/common-dnd-npcs.md
-  - role: user
-    content_file: ./grounding.md
-  - role: user
-    content_file: ./task.md
-  - role: user
-    content_file: ./instructions.md
-    cache_control:
-      type: ephemeral
-output:
-  format: json
-  validation_mode: json_schema
-  schema_path: dnd_enemy_events_llm.v1.json
-  repair_attempts: 0

internal/modules/dnd/extract/enemyevents/assets/prompts/grounding.md

@@ -1,12 +0,0 @@
-Compact combat grounding is supplied below. It can guide attention and
-disambiguation, but it is not evidence. Do not derive an event, subject,
-outcome, or source range from either list. The current transcript alone must
-directly establish every returned event.
-
-Combat-turn grounding:
-
-{{ input "combat_turns" }}
-
-Named combat-opponent grounding:
-
-{{ input "npc_interactions" }}

internal/modules/dnd/extract/enemyevents/assets/prompts/instructions.md

@@ -1,14 +0,0 @@
-Exclude party members, allies, neutral observers, mentioned-but-absent enemies,
-hazards, traps, environmental effects, uncertain allegiance, table talk,
-planning, hypotheses, recaps outside this passage, and downstream inference.
-
-Do not infer an engagement or outcome from initiative, turn absence, damage,
-defeat, movement, a scene ending, combat-opponent grounding, or any auxiliary
-artifact. Auxiliary inputs can guide attention but cannot prove or supply an
-event. Cite only narrow current-transcript ranges that establish each event.
-
-Return the `events` array even when no enemy event is established. Every event
-must contain only `name`, `kind`, and `source_refs`. Use exactly one kind:
-`engaged`, `killed`, `fled`, `captured`, or `incapacitated`. Each source range
-uses integer `start_unit_id` and `end_unit_id`; omit `source_id` because
-Notarius assigns the current source identity.

internal/modules/dnd/extract/enemyevents/assets/prompts/task.md

@@ -1,20 +0,0 @@
-Extract Dungeons & Dragons enemy events from the supplied combat transcript.
-
-Return an `engaged` event only when the transcript directly establishes that a
-subject is actively opposing the party in combat. Return `killed`, `fled`,
-`captured`, or `incapacitated` only when the transcript explicitly establishes
-that outcome. An outcome may share evidence with an engagement, and a later
-engagement or outcome for the same subject remains a separate observation.
-Emit at most one engagement for the same subject in this combat scene.
-
-For `killed`, direct death or killing is required. For `fled`, the subject must
-explicitly escape, retreat, or leave combat to avoid continued engagement. For
-`captured`, the subject must be explicitly taken prisoner or secured under the
-party's control. For `incapacitated`, the subject must be explicitly unable to
-continue acting without being established as killed or captured.
-
-Use a normalized NPC registry spelling when the transcript identifies that
-named NPC. A hostile creature without a registry entry is allowed. For unnamed
-individuals or groups, use only the narrowest transcript-grounded label, such
-as `Orcs`, `One orc`, or `Remaining orcs`; never invent member names, IDs, or
-quantities.

internal/modules/dnd/extract/enemyevents/assets/schemas/dnd_enemy_events_llm.v1.json

@@ -1,33 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "notarius.dnd.enemy_events.llm",
-  "type": "object",
-  "additionalProperties": false,
-  "required": ["events"],
-  "properties": {
-    "events": {
-      "type": "array",
-      "items": {
-        "type": "object",
-        "additionalProperties": false,
-        "required": ["name", "kind", "source_refs"],
-        "properties": {
-          "name": {"type": "string"},
-          "kind": {"type": "string"},
-          "source_refs": {
-            "type": "array",
-            "items": {
-              "type": "object",
-              "additionalProperties": false,
-              "required": ["start_unit_id", "end_unit_id"],
-              "properties": {
-                "start_unit_id": {"type": "integer"},
-                "end_unit_id": {"type": "integer"}
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}

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

@@ -2,8 +2,10 @@ package enemyevents
 
 import (
 	"fmt"
+	"io/fs"
 	"sync"
 
+	rootassets "gitea.maximumdirect.net/eric/notarius/assets"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/llm"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/promptfs"
 	"gitea.maximumdirect.net/eric/notarius/internal/modules/dnd/shared"
@@ -14,10 +16,10 @@ const promptAssetRoot = "assets/prompts"
 var promptAssetManifest = shared.PromptAssetManifest{
 	ModuleDir: "dnd.enemy_events",
 	ModuleFiles: []promptfs.ModulePromptFile{
-		{Name: "dnd.enemy_events.yaml", Path: "assets/prompts/dnd.enemy_events.yaml"},
-		{Name: "grounding.md", Path: "assets/prompts/grounding.md"},
-		{Name: "task.md", Path: "assets/prompts/task.md"},
-		{Name: "instructions.md", Path: "assets/prompts/instructions.md"},
+		{Name: "dnd.enemy_events.yaml", Path: "prompts/dnd.enemy_events.yaml"},
+		{Name: "grounding.md", Path: "prompts/grounding.md"},
+		{Name: "task.md", Path: "prompts/task.md"},
+		{Name: "instructions.md", Path: "prompts/instructions.md"},
 	},
 	SharedFiles: []string{
 		"common-dnd-system.md",
@@ -29,20 +31,41 @@ var promptAssetManifest = shared.PromptAssetManifest{
 	},
 }
 
+func moduleAssetFS() (fs.FS, error) {
+	assets, err := fs.Sub(rootassets.FS(), "dnd/enemy-events")
+	if err != nil {
+		return nil, fmt.Errorf("scope enemy-event assets: %w", err)
+	}
+	return assets, nil
+}
+
 func RegisterPromptAssets(registry *llm.AssetRegistry) error {
-	promptFS, err := promptAssetManifest.PromptFS(embeddedAssets)
+	assets, err := moduleAssetFS()
+	if err != nil {
+		return err
+	}
+	promptFS, err := promptAssetManifest.PromptFS(assets)
 	if err != nil {
 		return fmt.Errorf("prepare enemy-event prompt assets: %w", err)
 	}
 	if err := registry.RegisterPromptFS(promptFS, promptAssetRoot); err != nil {
 		return err
 	}
-	return registry.RegisterSchemaFS(embeddedAssets, "assets/schemas")
+	schemas, err := fs.Sub(assets, "schemas")
+	if err != nil {
+		return fmt.Errorf("scope enemy-event schemas: %w", err)
+	}
+	return registry.RegisterSchemaFS(schemas, ".")
 }
 
 func promptAssetMetadata() (string, error) {
 	promptAssetHashOnce.Do(func() {
-		promptAssetHash, promptAssetHashErr = promptAssetManifest.Hash(embeddedAssets)
+		assets, err := moduleAssetFS()
+		if err != nil {
+			promptAssetHashErr = err
+			return
+		}
+		promptAssetHash, promptAssetHashErr = promptAssetManifest.Hash(assets)
 	})
 	return promptAssetHash, promptAssetHashErr
 }

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

@@ -11,11 +11,15 @@ const (
 )
 
 func loadResponseSchema() (llm.ResponseSchema, error) {
-	return llm.LoadResponseSchema(embeddedAssets, llm.ResponseSchemaDefinition{
+	assets, err := moduleAssetFS()
+	if err != nil {
+		return llm.ResponseSchema{}, err
+	}
+	return llm.LoadResponseSchema(assets, llm.ResponseSchemaDefinition{
 		Key:       ResponseSchemaKey,
 		ID:        ResponseSchemaID,
 		Version:   SchemaVersion,
 		Name:      ResponseSchemaName,
-		AssetPath: "assets/schemas/dnd_enemy_events_llm.v1.json",
+		AssetPath: "schemas/dnd_enemy_events_llm.v1.json",
 	})
 }