xonecas.io
60255
Zn

Zoea-Nova / commit 79e164a

refactor(provider): migrate OpenCode to use OpenAI-compliant common types

- Use openaiChatResponse instead of Ollama's chatCompletionResponse
- Remove reasoning() method call (not in OpenAI standard)
- Use mergeSystemMessagesOpenAI from common file
- Use toOpenAITools from common file
- Remove duplicate mergeConsecutiveSystemMessages function
- OpenCode now fully independent of Ollama internals

xonecas2026-02-06 79e164a661a62b00d5cb816e19511cada35dbf44 parent acc31af

1 file changed

internal/provider/opencode.go+67−34
@@ -10,6 +10,7 @@ import (
1010 "net/http"
1111 "strings"
1212
13+ "github.com/rs/zerolog/log"
1314 openai "github.com/sashabaranov/go-openai"
1415 "golang.org/x/time/rate"
1516 )
@@ -61,7 +62,7 @@ func (p *OpenCodeProvider) Chat(ctx context.Context, messages []Message) (string
6162
6263 resp, err := p.createChatCompletion(ctx, openai.ChatCompletionRequest{
6364 Model: p.model,
64- Messages: toOpenAIMessages(messages),
65+ Messages: mergeSystemMessagesOpenAI(toOpenAIMessages(messages)),
6566 Temperature: float32(p.temperature),
6667 })
6768 if err != nil {
@@ -84,37 +85,14 @@ func (p *OpenCodeProvider) ChatWithTools(ctx context.Context, messages []Message
8485 }
8586
8687 // Convert tools to OpenAI format
87- openaiTools := make([]openai.Tool, len(tools))
88- for i, t := range tools {
89- var params map[string]interface{}
90- if len(t.Parameters) > 0 {
91- if err := json.Unmarshal(t.Parameters, &params); err != nil {
92- params = map[string]interface{}{
93- "type": "object",
94- "properties": map[string]interface{}{},
95- }
96- }
97- }
98- if params == nil {
99- params = map[string]interface{}{
100- "type": "object",
101- "properties": map[string]interface{}{},
102- }
103- }
104-
105- openaiTools[i] = openai.Tool{
106- Type: openai.ToolTypeFunction,
107- Function: &openai.FunctionDefinition{
108- Name: t.Name,
109- Description: t.Description,
110- Parameters: params,
111- },
112- }
88+ openaiTools, err := toOpenAITools(tools)
89+ if err != nil {
90+ return nil, fmt.Errorf("invalid tool schema: %w", err)
11391 }
11492
11593 resp, err := p.createChatCompletion(ctx, openai.ChatCompletionRequest{
11694 Model: p.model,
117- Messages: toOpenAIMessages(messages),
95+ Messages: mergeSystemMessagesOpenAI(toOpenAIMessages(messages)),
11896 Tools: openaiTools,
11997 Temperature: float32(p.temperature),
12098 })
@@ -123,15 +101,24 @@ func (p *OpenCodeProvider) ChatWithTools(ctx context.Context, messages []Message
123101 }
124102
125103 if len(resp.Choices) == 0 {
104+ log.Error().
105+ Str("provider", "opencode_zen").
106+ Msg("OpenCode returned empty choices array")
126107 return nil, errors.New("no response choices")
127108 }
128109
129110 choice := resp.Choices[0]
130111 result := &ChatResponse{
131112 Content: choice.Message.Content,
132- Reasoning: choice.Message.reasoning(),
113+ Reasoning: "", // OpenAI standard doesn't provide reasoning field
133114 }
134115
116+ log.Debug().
117+ Str("provider", "opencode_zen").
118+ Str("content", choice.Message.Content).
119+ Int("tool_call_count", len(choice.Message.ToolCalls)).
120+ Msg("OpenCode ChatWithTools result")
121+
135122 // Extract tool calls if present
136123 if len(choice.Message.ToolCalls) > 0 {
137124 result.ToolCalls = make([]ToolCall, len(choice.Message.ToolCalls))
@@ -141,19 +128,34 @@ func (p *OpenCodeProvider) ChatWithTools(ctx context.Context, messages []Message
141128 Name: tc.Function.Name,
142129 Arguments: json.RawMessage(tc.Function.Arguments),
143130 }
131+ log.Debug().
132+ Str("provider", "opencode_zen").
133+ Str("tool_call_id", tc.ID).
134+ Str("tool_name", tc.Function.Name).
135+ Str("arguments", tc.Function.Arguments).
136+ Msg("OpenCode tool call extracted")
144137 }
145138 }
146139
147140 return result, nil
148141 }
149142
150-func (p *OpenCodeProvider) createChatCompletion(ctx context.Context, req openai.ChatCompletionRequest) (*chatCompletionResponse, error) {
143+func (p *OpenCodeProvider) createChatCompletion(ctx context.Context, req openai.ChatCompletionRequest) (*openaiChatResponse, error) {
151144 body, err := json.Marshal(req)
152145 if err != nil {
153146 return nil, err
154147 }
155148
156149 url := p.baseURL + "/chat/completions"
150+ log.Debug().
151+ Str("provider", "opencode_zen").
152+ Str("url", url).
153+ Str("model", req.Model).
154+ Bool("has_api_key", p.apiKey != "").
155+ Int("message_count", len(req.Messages)).
156+ Int("tool_count", len(req.Tools)).
157+ Str("request_body", string(body)).
158+ Msg("OpenCode chat completion request")
157159 httpReq, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(body))
158160 if err != nil {
159161 return nil, err
@@ -169,16 +171,47 @@ func (p *OpenCodeProvider) createChatCompletion(ctx context.Context, req openai.
169171 }
170172 defer resp.Body.Close()
171173
174+ log.Debug().
175+ Str("provider", "opencode_zen").
176+ Str("url", url).
177+ Int("status", resp.StatusCode).
178+ Msg("OpenCode chat completion response")
179+
172180 if resp.StatusCode < 200 || resp.StatusCode >= 300 {
173181 payload, _ := io.ReadAll(resp.Body)
182+ log.Error().
183+ Str("provider", "opencode_zen").
184+ Int("status", resp.StatusCode).
185+ Str("body", string(payload)).
186+ Msg("OpenCode non-2xx response")
174187 return nil, fmt.Errorf("chat completion status %d: %s", resp.StatusCode, strings.TrimSpace(string(payload)))
175188 }
176189
177- var decoded chatCompletionResponse
178- if err := json.NewDecoder(resp.Body).Decode(&decoded); err != nil {
179- return nil, err
190+ // Read body for logging
191+ bodyBytes, err := io.ReadAll(resp.Body)
192+ if err != nil {
193+ log.Error().
194+ Str("provider", "opencode_zen").
195+ Err(err).
196+ Msg("OpenCode failed to read response body")
197+ return nil, fmt.Errorf("read response body: %w", err)
180198 }
181199
200+ var decoded openaiChatResponse
201+ if err := json.Unmarshal(bodyBytes, &decoded); err != nil {
202+ log.Error().
203+ Str("provider", "opencode_zen").
204+ Err(err).
205+ Str("body", string(bodyBytes)).
206+ Msg("OpenCode JSON decode failed")
207+ return nil, fmt.Errorf("decode response: %w", err)
208+ }
209+
210+ log.Debug().
211+ Str("provider", "opencode_zen").
212+ Int("choice_count", len(decoded.Choices)).
213+ Msg("OpenCode response decoded")
214+
182215 return &decoded, nil
183216 }
184217
@@ -192,7 +225,7 @@ func (p *OpenCodeProvider) Stream(ctx context.Context, messages []Message) (<-ch
192225
193226 stream, err := p.client.CreateChatCompletionStream(ctx, openai.ChatCompletionRequest{
194227 Model: p.model,
195- Messages: toOpenAIMessages(messages),
228+ Messages: mergeSystemMessagesOpenAI(toOpenAIMessages(messages)),
196229 Temperature: float32(p.temperature),
197230 })
198231 if err != nil {