@@ -74,6 +74,49 @@ func toOpenAIMessages(messages []Message) []openai.ChatCompletionMessage {
7474 return result
7575 }
7676
77+// validateOpenAIMessages ensures message structure meets OpenAI API requirements:
78+// 1. At least one non-system message exists
79+// 2. Conversation ends with user message (if expecting completion)
80+// 3. No consecutive assistant messages without user messages between them
81+//
82+// Returns error if validation fails.
83+func validateOpenAIMessages(messages []openai.ChatCompletionMessage) error {
84+ if len(messages) == 0 {
85+ return errors.New("messages array is empty")
86+ }
87+
88+ // Count message types
89+ hasUser := false
90+ hasAssistant := false
91+ lastRole := ""
92+
93+ for _, msg := range messages {
94+ if msg.Role == "user" {
95+ hasUser = true
96+ }
97+ if msg.Role == "assistant" {
98+ hasAssistant = true
99+ // Check for consecutive assistant messages
100+ if lastRole == "assistant" {
101+ log.Warn().Msg("OpenAI: Consecutive assistant messages detected")
102+ }
103+ }
104+ lastRole = msg.Role
105+ }
106+
107+ // If we have assistant messages but no user messages, that's invalid
108+ if hasAssistant && !hasUser {
109+ return errors.New("conversation has assistant messages but no user messages")
110+ }
111+
112+ // If last message is assistant (and we're expecting a completion), that's invalid
113+ if lastRole == "assistant" {
114+ log.Warn().Msg("OpenAI: Conversation ends with assistant message - may cause issues")
115+ }
116+
117+ return nil
118+}
119+
77120 // mergeSystemMessagesOpenAI merges all system messages into a single message at the start.
78121 // OpenAI Chat Completions API requires:
79122 // 1. System messages must be first
@@ -87,6 +130,12 @@ func mergeSystemMessagesOpenAI(messages []openai.ChatCompletionMessage) []openai
87130 return messages
88131 }
89132
133+ // Validate messages before processing
134+ if err := validateOpenAIMessages(messages); err != nil {
135+ log.Error().Err(err).Msg("OpenAI: Message validation failed")
136+ // Continue processing but log the issue
137+ }
138+
90139 // Separate system messages from others
91140 var systemBuffer strings.Builder
92141 nonSystemMessages := make([]openai.ChatCompletionMessage, 0, len(messages))