Centralize spell and combat-turn assets

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

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

internal/modules/dnd/extract/combatturns/assets/prompts/dnd.combat_turns.yaml

@@ -1,47 +0,0 @@
-id: dnd.combat_turns
-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: false
-    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: ./task.md
-  - role: user
-    content_file: ./instructions.md
-    cache_control:
-      type: ephemeral
-output:
-  format: json
-  validation_mode: json_schema
-  schema_path: dnd_combat_turns_llm.v1.json
-  repair_attempts: 0

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

@@ -1,6 +0,0 @@
-Return the combat_turns array even when no combat turn is established. Return
-actor, turn_kind, and source_refs for every record. For turn_kind, use exactly
-one of: turn, reaction, legendary_action, lair_action, or other. Cite the
-transcript ranges that establish both the actor and the combat event. Use the
-players, party, and transcript context to map speakers to in-world actors. NPC
-names may help disambiguate identity but do not replace transcript evidence.

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

@@ -1,18 +0,0 @@
-Extract Dungeons & Dragons combat-turn artifacts from the supplied transcript.
-
-Include a record only when the transcript establishes that an in-world
-participant takes a combat turn or performs a discrete interrupting combat
-event. Interrupting events belong at the point where they occur in transcript
-chronology.
-
-Exclude initiative setup without a turn or combat event, tactical planning,
-table talk, rules lookup, hypothetical events, abandoned intentions, recaps
-outside the current passage, and downstream consequences.
-
-Do not infer combat events from D&D rules knowledge. Preserve the session as
-played and attribute relevant nonstandard rulings to the GM or table.
-
-Unmatched actors remain permitted.
-
-Place all supporting transcript ranges for a turn in its turn-level source_refs
-collection.

internal/modules/dnd/extract/combatturns/assets/schemas/dnd_combat_turns_llm.v1.json

@@ -1,41 +0,0 @@
-{
-  "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "notarius.dnd.combat_turns.llm",
-  "type": "object",
-  "additionalProperties": false,
-  "required": ["combat_turns"],
-  "properties": {
-    "combat_turns": {
-      "type": "array",
-      "items": {
-        "type": "object",
-        "additionalProperties": false,
-        "required": ["actor", "turn_kind", "source_refs"],
-        "properties": {
-          "actor": {
-            "type": "string"
-          },
-          "turn_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/combatturns/prompt_assets.go

@@ -2,8 +2,10 @@ package combatturns
 
 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,9 +16,9 @@ const promptAssetRoot = "assets/prompts"
 var promptAssetManifest = shared.PromptAssetManifest{
 	ModuleDir: "dnd.combat_turns",
 	ModuleFiles: []promptfs.ModulePromptFile{
-		{Name: "dnd.combat_turns.yaml", Path: "assets/prompts/dnd.combat_turns.yaml"},
-		{Name: "task.md", Path: "assets/prompts/task.md"},
-		{Name: "instructions.md", Path: "assets/prompts/instructions.md"},
+		{Name: "dnd.combat_turns.yaml", Path: "prompts/dnd.combat_turns.yaml"},
+		{Name: "task.md", Path: "prompts/task.md"},
+		{Name: "instructions.md", Path: "prompts/instructions.md"},
 	},
 	SharedFiles: []string{
 		"common-dnd-system.md",
@@ -28,20 +30,41 @@ var promptAssetManifest = shared.PromptAssetManifest{
 	},
 }
 
+func moduleAssetFS() (fs.FS, error) {
+	assets, err := fs.Sub(rootassets.FS(), "dnd/combat-turns")
+	if err != nil {
+		return nil, fmt.Errorf("scope combat-turn 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 combat-turn 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 combat-turn 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/combatturns/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_combat_turns_llm.v1.json",
+		AssetPath: "schemas/dnd_combat_turns_llm.v1.json",
 	})
 }