Refactor: split prompt definition from execution settings and migrate run contracts to prompt_* + execution_target

internal/domain/domain.go

@@ -43,34 +43,36 @@ const (
 
 // RunRequest represents a request to generate a single artifact.
 type RunRequest struct {
-	ProfileID      string
-	ProfileVersion string
-	Inputs         map[string]ArtifactRef
-	Vars           map[string]string
-	Model          *ModelTarget
-	Validation     *OutputContract
-	Metadata       map[string]string
+	PromptID      string
+	PromptVersion string
+	ProfileID     string
+	Inputs        map[string]ArtifactRef
+	Vars          map[string]string
+	Execution     *ExecutionTarget
+	Validation    *OutputContract
+	Metadata      map[string]string
 }
 
 // RunResult represents the complete result of a prompt execution run.
 type RunResult struct {
-	RunID          string
-	Artifact       Artifact
-	RawOutput      string
-	Validation     ValidationResult
-	ProfileID      string
-	ProfileVersion string
-	ProfileHash    string
-	ModelName      string
-	Endpoint       string
-	ModelParams    ModelTarget
-	InputHashes    map[string]string
-	PromptHash     string
-	Usage          TokenUsage
-	StartTime      time.Time
-	EndTime        time.Time
-	Duration       time.Duration
-	Error          error
+	RunID                string
+	Artifact             Artifact
+	RawOutput            string
+	Validation           ValidationResult
+	PromptID             string
+	PromptVersion        string
+	PromptHash           string
+	RenderedPromptHash   string
+	SelectedProfileID    string
+	ModelName            string
+	Endpoint             string
+	EffectiveModelParams ExecutionTarget
+	InputHashes          map[string]string
+	Usage                TokenUsage
+	StartTime            time.Time
+	EndTime              time.Time
+	Duration             time.Duration
+	Error                error
 }
 
 // ArtifactRef represents a reference to an input artifact.
@@ -90,32 +92,58 @@ type Artifact struct {
 	Hash        string
 }
 
-// PromptProfile represents a configured prompt execution profile.
-type PromptProfile struct {
+// PromptDefinition represents a configured prompt execution definition.
+type PromptDefinition struct {
 	ID             string                  `yaml:"id"`
 	Version        string                  `yaml:"version"`
+	DefaultProfile string                  `yaml:"default_profile"`
 	Description    string                  `yaml:"description"`
-	ExpectedInputs []string                `yaml:"expected_inputs"`
+	Inputs         []PromptInput           `yaml:"inputs"`
 	Templates      []PromptMessageTemplate `yaml:"templates"`
-	ModelDefaults  ModelTarget             `yaml:"model_defaults"`
 	OutputFormat   OutputFormat            `yaml:"output_format"`
 	Validation     OutputContract          `yaml:"validation"`
 }
 
-// PromptMessageTemplate defines a template for a chat message.
-type PromptMessageTemplate struct {
-	Role    string `yaml:"role"`
-	Content string `yaml:"content"`
+// PromptInput describes one named input expected by a prompt definition.
+type PromptInput struct {
+	Name        string `yaml:"name"`
+	Required    bool   `yaml:"required"`
+	ContentType string `yaml:"content_type"`
+	Description string `yaml:"description"`
 }
 
-// ModelTarget represents the LLM endpoint and configuration.
-type ModelTarget struct {
-	Endpoint       string  `yaml:"endpoint"`
-	Model          string  `yaml:"model"`
-	Temperature    float64 `yaml:"temperature"`
-	MaxTokens      int     `yaml:"max_tokens"`
-	TopP           float64 `yaml:"top_p"`
-	TimeoutSeconds int     `yaml:"timeout_seconds"`
+// PromptMessageTemplate defines a template for a chat message.
+type PromptMessageTemplate struct {
+	Role        string `yaml:"role"`
+	Content     string `yaml:"content"`
+	ContentFile string `yaml:"content_file"`
+}
+
+// ExecutionProfile describes how and where to execute a model.
+type ExecutionProfile struct {
+	ID              string            `yaml:"id"`
+	Endpoint        string            `yaml:"endpoint"`
+	Model           string            `yaml:"model"`
+	Temperature     float64           `yaml:"temperature"`
+	MaxTokens       int               `yaml:"max_tokens"`
+	TopP            float64           `yaml:"top_p"`
+	TimeoutSeconds  int               `yaml:"timeout_seconds"`
+	ReasoningEffort string            `yaml:"reasoning_effort"`
+	APIKeyEnv       string            `yaml:"api_key_env"`
+	ExtraParams     map[string]string `yaml:"extra_params"`
+}
+
+// ExecutionTarget represents effective model runtime settings for a run.
+type ExecutionTarget struct {
+	Endpoint        string            `yaml:"endpoint" json:"endpoint"`
+	Model           string            `yaml:"model" json:"model"`
+	Temperature     float64           `yaml:"temperature" json:"temperature"`
+	MaxTokens       int               `yaml:"max_tokens" json:"max_tokens"`
+	TopP            float64           `yaml:"top_p" json:"top_p"`
+	TimeoutSeconds  int               `yaml:"timeout_seconds" json:"timeout_seconds"`
+	ReasoningEffort string            `yaml:"reasoning_effort" json:"reasoning_effort"`
+	APIKeyEnv       string            `yaml:"api_key_env" json:"api_key_env"`
+	ExtraParams     map[string]string `yaml:"extra_params" json:"extra_params"`
 }
 
 // OutputContract defines the requirements for the output artifact.
@@ -140,7 +168,7 @@ type RenderedMessage struct {
 // GenerateRequest is the internal request passed to the LLM client.
 type GenerateRequest struct {
 	Prompt RenderedPrompt
-	Target ModelTarget
+	Target ExecutionTarget
 }
 
 // GenerateResponse is the response received from the LLM client.
@@ -168,19 +196,20 @@ type ValidationResult struct {
 
 // RunMetadata contains auditing information for a run.
 type RunMetadata struct {
-	RunID            string
-	ProfileID        string
-	ProfileVersion   string
-	ProfileHash      string
-	PromptHash       string
-	InputHashes      map[string]string
-	ModelEndpoint    string
-	ModelName        string
-	Params           ModelTarget
-	Timestamp        time.Time
-	Duration         time.Duration
-	Usage            TokenUsage
-	ValidationMode   ValidationMode
-	ValidationStatus ValidationStatus
-	RepairAttempts   int
+	RunID              string
+	PromptID           string
+	PromptVersion      string
+	PromptHash         string
+	RenderedPromptHash string
+	SelectedProfileID  string
+	InputHashes        map[string]string
+	ModelEndpoint      string
+	ModelName          string
+	Params             ExecutionTarget
+	Timestamp          time.Time
+	Duration           time.Duration
+	Usage              TokenUsage
+	ValidationMode     ValidationMode
+	ValidationStatus   ValidationStatus
+	RepairAttempts     int
 }