mirror of
https://github.com/alibaba/open-code-review.git
synced 2026-07-10 01:39:12 +00:00
- Propagate json.Unmarshal error in buildAnthropicParams when parsing tool call arguments, preventing silent empty-map fallback on malformed JSON - Return explicit error message in ParseComments when comments JSON string fails to unmarshal, instead of silently ignoring Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
82 lines
2.1 KiB
Go
82 lines
2.1 KiB
Go
package tool
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"github.com/open-code-review/open-code-review/internal/model"
|
|
)
|
|
|
|
// CodeCommentProvider submits review comments to the per-Agent CommentCollector.
|
|
type CodeCommentProvider struct {
|
|
Collector *CommentCollector
|
|
}
|
|
|
|
func (p *CodeCommentProvider) Tool() Tool { return CodeComment }
|
|
|
|
func (p *CodeCommentProvider) Execute(_ context.Context, args map[string]any) (string, error) {
|
|
if p.Collector == nil {
|
|
return "Error: comment collector is not configured", nil
|
|
}
|
|
|
|
comments, errMsg := ParseComments(args)
|
|
if errMsg != "" {
|
|
return errMsg, nil
|
|
}
|
|
|
|
for i := range comments {
|
|
p.Collector.Add(comments[i])
|
|
}
|
|
return CommentSucceed, nil
|
|
}
|
|
|
|
// ParseComments extracts LlmComment entries from tool call arguments without writing
|
|
// to the Collector. Returns parsed comments and an error message (empty on success).
|
|
func ParseComments(args map[string]any) ([]model.LlmComment, string) {
|
|
var rawComments []any
|
|
if arr, ok := args["comments"].([]any); ok && len(arr) > 0 {
|
|
rawComments = arr
|
|
} else if s, ok := args["comments"].(string); ok && s != "" {
|
|
if err := json.Unmarshal([]byte(s), &rawComments); err != nil {
|
|
return nil, fmt.Sprintf("Error: failed to parse 'comments' JSON string: %v", err)
|
|
}
|
|
}
|
|
if len(rawComments) == 0 {
|
|
raw, _ := json.Marshal(args)
|
|
return nil, fmt.Sprintf("Error: 'comments' array is required. Got args: %s", string(raw))
|
|
}
|
|
|
|
var comments []model.LlmComment
|
|
for _, raw := range rawComments {
|
|
obj, ok := raw.(map[string]any)
|
|
if !ok {
|
|
continue
|
|
}
|
|
|
|
cm := model.LlmComment{}
|
|
|
|
if content, ok := obj["content"].(string); ok {
|
|
cm.Content = content
|
|
}
|
|
if suggestion, ok := obj["suggestion_code"].(string); ok {
|
|
cm.SuggestionCode = suggestion
|
|
}
|
|
if existing, ok := obj["existing_code"].(string); ok {
|
|
cm.ExistingCode = existing
|
|
}
|
|
if thinking, ok := obj["thinking"].(string); ok {
|
|
cm.Thinking = thinking
|
|
}
|
|
if path, ok := args["path"].(string); ok {
|
|
cm.Path = path
|
|
}
|
|
|
|
if cm.Path == "" || cm.Content == "" {
|
|
continue
|
|
}
|
|
|
|
comments = append(comments, cm)
|
|
}
|
|
return comments, ""
|
|
}
|