xonecas.io
60255
Zn

Zoea-Nova / commit 9348f50

fix(provider): improve system message merging to preserve conversation

Previous implementation was too aggressive - it stripped ALL system messages
regardless of position, destroying conversation history (21 msgs -> 2 msgs).

New approach:
- Merges all system messages into one at the start
- Preserves all user/assistant conversation messages
- Maintains conversation flow and history
- Still adds fallback user message if only system messages exist

This fixes OpenCode Zen errors caused by invalid message structures.

xonecas2026-02-06 9348f504f4f7fe73a86d2034ceda492e0795c7df parent 22b77f5

1 file changed

internal/provider/openai_common.go+33−27
@@ -2,6 +2,7 @@ package provider
22
33 import (
44 "encoding/json"
5+ "errors"
56 "strings"
67
78 "github.com/rs/zerolog/log"
@@ -117,55 +118,52 @@ func validateOpenAIMessages(messages []openai.ChatCompletionMessage) error {
117118 return nil
118119 }
119120
120-// mergeSystemMessagesOpenAI merges all system messages into a single message at the start.
121-// OpenAI Chat Completions API requires:
122-// 1. System messages must be first
123-// 2. At least one non-system message must follow
121+// mergeSystemMessagesOpenAI merges system messages intelligently while preserving conversation flow.
124122 //
125-// This function collects ALL system messages regardless of position and places them
126-// at the start as a single merged message. If only system messages exist, it adds
127-// a minimal "Begin." user message to meet OpenAI requirements.
123+// Strategy:
124+// 1. Separate initial system messages (before any user/assistant messages)
125+// 2. Keep user/assistant conversation intact
126+// 3. Merge any mid-conversation system messages into the initial system prompt
127+//
128+// OpenAI requires:
129+// - System messages at the start
130+// - At least one non-system message
131+// - Proper user/assistant alternation
128132 func mergeSystemMessagesOpenAI(messages []openai.ChatCompletionMessage) []openai.ChatCompletionMessage {
129133 if len(messages) == 0 {
130134 return messages
131135 }
132136
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-
139- // Separate system messages from others
140- var systemBuffer strings.Builder
141- nonSystemMessages := make([]openai.ChatCompletionMessage, 0, len(messages))
137+ // Separate system messages from conversation messages
138+ var systemMessages []string
139+ var conversationMessages []openai.ChatCompletionMessage
142140
143141 for _, msg := range messages {
144142 if msg.Role == "system" {
145- if systemBuffer.Len() > 0 {
146- systemBuffer.WriteString("\n\n")
147- }
148- systemBuffer.WriteString(msg.Content)
143+ systemMessages = append(systemMessages, msg.Content)
149144 } else {
150- nonSystemMessages = append(nonSystemMessages, msg)
145+ conversationMessages = append(conversationMessages, msg)
151146 }
152147 }
153148
154- // Build result: system first, then non-system
149+ // Build result: merged system message + conversation
155150 result := make([]openai.ChatCompletionMessage, 0, len(messages))
156151
157- if systemBuffer.Len() > 0 {
152+ // Add merged system message if any system messages exist
153+ if len(systemMessages) > 0 {
154+ mergedSystem := strings.Join(systemMessages, "\n\n")
158155 result = append(result, openai.ChatCompletionMessage{
159156 Role: "system",
160- Content: systemBuffer.String(),
157+ Content: mergedSystem,
161158 })
162159 }
163160
164- result = append(result, nonSystemMessages...)
161+ // Add conversation messages
162+ result = append(result, conversationMessages...)
165163
166164 // OpenAI requires at least one non-system message
167165 // If we only have system messages, add a minimal user message
168- if len(nonSystemMessages) == 0 && len(result) > 0 {
166+ if len(conversationMessages) == 0 && len(result) > 0 {
169167 log.Debug().
170168 Msg("OpenAI: Only system messages present, adding minimal user message")
171169 result = append(result, openai.ChatCompletionMessage{
@@ -174,10 +172,18 @@ func mergeSystemMessagesOpenAI(messages []openai.ChatCompletionMessage) []openai
174172 })
175173 }
176174
175+ // If conversation ends with assistant message, warn (may cause issues)
176+ if len(result) > 1 && result[len(result)-1].Role == "assistant" {
177+ log.Warn().
178+ Msg("OpenAI: Conversation ends with assistant message")
179+ }
180+
177181 log.Debug().
178182 Int("original_count", len(messages)).
179183 Int("merged_count", len(result)).
180- Bool("added_user_msg", len(nonSystemMessages) == 0 && len(result) > 0).
184+ Int("system_merged", len(systemMessages)).
185+ Int("conversation_kept", len(conversationMessages)).
186+ Bool("added_user_msg", len(conversationMessages) == 0 && len(result) > 0).
181187 Msg("OpenAI: Merged system messages")
182188
183189 return result