refactor(responses): remove chat_completions and wire responses features end-to-end

2026-05-17 15:27:30 +08:00 · 2026-03-04 10:25:50 +08:00
parent d42b6a6f10
commit 6c78ef3b1c
14 changed files with 726 additions and 486 deletions
--- a/pkg/agent/loop.go
+++ b/pkg/agent/loop.go
@@ -777,17 +777,7 @@ func (al *AgentLoop) processMessage(ctx context.Context, msg bus.InboundMessage)
 			})

 		toolDefs := al.tools.GetDefinitions()
-		providerToolDefs := make([]providers.ToolDefinition, 0, len(toolDefs))
-		for _, td := range toolDefs {
-			providerToolDefs = append(providerToolDefs, providers.ToolDefinition{
-				Type: td["type"].(string),
-				Function: providers.ToolFunctionDefinition{
-					Name:        td["function"].(map[string]interface{})["name"].(string),
-					Description: td["function"].(map[string]interface{})["description"].(string),
-					Parameters:  td["function"].(map[string]interface{})["parameters"].(map[string]interface{}),
-				},
-			})
-		}
+		providerToolDefs := al.buildProviderToolDefs(toolDefs)

 		// Log LLM request details
 		logger.DebugCF("agent", logger.C0152,
@@ -809,7 +799,8 @@ func (al *AgentLoop) processMessage(ctx context.Context, msg bus.InboundMessage)
 				"tools_json":    formatToolsForLog(providerToolDefs),
 			})

-		options := map[string]interface{}{"max_tokens": 8192, "temperature": 0.7}
+		messages = injectResponsesMediaParts(messages, msg.Media, msg.MediaItems)
+		options := buildResponsesOptions(8192, 0.7)
 		var response *providers.LLMResponse
 		var err error
 		if msg.Channel == "telegram" && strings.TrimSpace(os.Getenv("CLAWGO_TELEGRAM_STREAMING")) == "1" {
@@ -850,11 +841,6 @@ func (al *AgentLoop) processMessage(ctx context.Context, msg bus.InboundMessage)
 			}
 		}
 		if err != nil {
-			errText := strings.ToLower(err.Error())
-			if strings.Contains(errText, "no tool call found for function call output") {
-				removed := al.sessions.PurgeOrphanToolOutputs(msg.SessionKey)
-				logger.WarnCF("agent", logger.C0154, map[string]interface{}{"session_key": msg.SessionKey, "removed": removed})
-			}
 			logger.ErrorCF("agent", logger.C0155,
 				map[string]interface{}{
 					"iteration": iteration,
@@ -1150,17 +1136,7 @@ func (al *AgentLoop) processSystemMessage(ctx context.Context, msg bus.InboundMe
 		iteration++

 		toolDefs := al.tools.GetDefinitions()
-		providerToolDefs := make([]providers.ToolDefinition, 0, len(toolDefs))
-		for _, td := range toolDefs {
-			providerToolDefs = append(providerToolDefs, providers.ToolDefinition{
-				Type: td["type"].(string),
-				Function: providers.ToolFunctionDefinition{
-					Name:        td["function"].(map[string]interface{})["name"].(string),
-					Description: td["function"].(map[string]interface{})["description"].(string),
-					Parameters:  td["function"].(map[string]interface{})["parameters"].(map[string]interface{}),
-				},
-			})
-		}
+		providerToolDefs := al.buildProviderToolDefs(toolDefs)

 		// Log LLM request details
 		logger.DebugCF("agent", logger.C0152,
@@ -1182,10 +1158,7 @@ func (al *AgentLoop) processSystemMessage(ctx context.Context, msg bus.InboundMe
 				"tools_json":    formatToolsForLog(providerToolDefs),
 			})

-		options := map[string]interface{}{
-			"max_tokens":  8192,
-			"temperature": 0.7,
-		}
+		options := buildResponsesOptions(8192, 0.7)
 		response, err := al.provider.Chat(ctx, messages, providerToolDefs, al.model, options)

 		if err != nil {
@@ -1200,40 +1173,6 @@ func (al *AgentLoop) processSystemMessage(ctx context.Context, msg bus.InboundMe
 			}
 		}
 		if err != nil {
-			errText := strings.ToLower(err.Error())
-			if strings.Contains(errText, "no tool call found for function call output") {
-				removed := al.sessions.PurgeOrphanToolOutputs(sessionKey)
-				logger.WarnCF("agent", logger.C0160, map[string]interface{}{"session_key": sessionKey, "removed": removed})
-				if removed > 0 {
-					// Rebuild context from cleaned history and retry current iteration.
-					history = al.sessions.GetHistory(sessionKey)
-					summary = al.sessions.GetSummary(sessionKey)
-					messages = al.contextBuilder.BuildMessages(
-						history,
-						summary,
-						msg.Content,
-						nil,
-						originChannel,
-						originChatID,
-						responseLang,
-					)
-					continue
-				}
-				if strings.ToLower(strings.TrimSpace(msg.Metadata["trigger"])) == "heartbeat" {
-					al.sessions.ResetSession(sessionKey)
-					messages = al.contextBuilder.BuildMessages(
-						[]providers.Message{},
-						"",
-						msg.Content,
-						nil,
-						originChannel,
-						originChatID,
-						responseLang,
-					)
-					logger.WarnCF("agent", logger.C0161, map[string]interface{}{"session_key": sessionKey})
-					continue
-				}
-			}
 			logger.ErrorCF("agent", logger.C0162,
 				map[string]interface{}{
 					"iteration": iteration,
@@ -1325,6 +1264,155 @@ func truncate(s string, maxLen int) string {
 	return s[:maxLen-3] + "..."
 }

+func (al *AgentLoop) buildProviderToolDefs(toolDefs []map[string]interface{}) []providers.ToolDefinition {
+	providerToolDefs := make([]providers.ToolDefinition, 0, len(toolDefs))
+	for _, td := range toolDefs {
+		fnRaw, ok := td["function"].(map[string]interface{})
+		if !ok {
+			continue
+		}
+		name, _ := fnRaw["name"].(string)
+		description, _ := fnRaw["description"].(string)
+		params, _ := fnRaw["parameters"].(map[string]interface{})
+		if strings.TrimSpace(name) == "" {
+			continue
+		}
+		if params == nil {
+			params = map[string]interface{}{}
+		}
+		providerToolDefs = append(providerToolDefs, providers.ToolDefinition{
+			Type: "function",
+			Function: providers.ToolFunctionDefinition{
+				Name:        name,
+				Description: description,
+				Parameters:  params,
+			},
+		})
+	}
+	return providerToolDefs
+}
+
+func buildResponsesOptions(maxTokens int64, temperature float64) map[string]interface{} {
+	options := map[string]interface{}{
+		"max_tokens":  maxTokens,
+		"temperature": temperature,
+	}
+	responseTools := make([]map[string]interface{}, 0, 2)
+	if strings.TrimSpace(os.Getenv("CLAWGO_RESPONSES_WEB_SEARCH")) == "1" {
+		webTool := map[string]interface{}{"type": "web_search"}
+		if contextSize := strings.TrimSpace(os.Getenv("CLAWGO_RESPONSES_WEB_SEARCH_CONTEXT_SIZE")); contextSize != "" {
+			webTool["search_context_size"] = contextSize
+		}
+		responseTools = append(responseTools, webTool)
+	}
+	if idsRaw := strings.TrimSpace(os.Getenv("CLAWGO_RESPONSES_FILE_SEARCH_VECTOR_STORE_IDS")); idsRaw != "" {
+		ids := splitCommaList(idsRaw)
+		if len(ids) > 0 {
+			fileSearch := map[string]interface{}{
+				"type":             "file_search",
+				"vector_store_ids": ids,
+			}
+			if maxNumRaw := strings.TrimSpace(os.Getenv("CLAWGO_RESPONSES_FILE_SEARCH_MAX_NUM_RESULTS")); maxNumRaw != "" {
+				if n, err := strconv.Atoi(maxNumRaw); err == nil && n > 0 {
+					fileSearch["max_num_results"] = n
+				}
+			}
+			responseTools = append(responseTools, fileSearch)
+		}
+	}
+	if len(responseTools) > 0 {
+		options["responses_tools"] = responseTools
+	}
+	if include := splitCommaList(strings.TrimSpace(os.Getenv("CLAWGO_RESPONSES_INCLUDE"))); len(include) > 0 {
+		options["responses_include"] = include
+	}
+	if strings.TrimSpace(os.Getenv("CLAWGO_RESPONSES_STREAM_INCLUDE_USAGE")) == "1" {
+		options["responses_stream_options"] = map[string]interface{}{"include_usage": true}
+	}
+	return options
+}
+
+func injectResponsesMediaParts(messages []providers.Message, media []string, mediaItems []bus.MediaItem) []providers.Message {
+	if len(messages) == 0 || (len(media) == 0 && len(mediaItems) == 0) {
+		return messages
+	}
+	last := len(messages) - 1
+	if strings.ToLower(strings.TrimSpace(messages[last].Role)) != "user" {
+		return messages
+	}
+
+	parts := make([]providers.MessageContentPart, 0, 1+len(media)+len(mediaItems))
+	if strings.TrimSpace(messages[last].Content) != "" {
+		parts = append(parts, providers.MessageContentPart{
+			Type: "input_text",
+			Text: messages[last].Content,
+		})
+	}
+
+	for _, ref := range media {
+		ref = strings.TrimSpace(ref)
+		if ref == "" {
+			continue
+		}
+		parts = append(parts, providers.MessageContentPart{
+			Type:     "input_image",
+			ImageURL: ref,
+		})
+	}
+
+	for _, item := range mediaItems {
+		typ := strings.ToLower(strings.TrimSpace(item.Type))
+		ref := strings.TrimSpace(item.Ref)
+		path := strings.TrimSpace(item.Path)
+		src := ref
+		if src == "" {
+			src = path
+		}
+		switch {
+		case strings.Contains(typ, "image"):
+			part := providers.MessageContentPart{Type: "input_image"}
+			if strings.HasPrefix(src, "file_") {
+				part.FileID = src
+			} else {
+				part.ImageURL = src
+			}
+			if part.FileID != "" || part.ImageURL != "" {
+				parts = append(parts, part)
+			}
+		case strings.Contains(typ, "file"), strings.Contains(typ, "document"), strings.Contains(typ, "audio"), strings.Contains(typ, "video"):
+			part := providers.MessageContentPart{Type: "input_file"}
+			if strings.HasPrefix(src, "file_") {
+				part.FileID = src
+			} else {
+				part.FileURL = src
+			}
+			if part.FileID != "" || part.FileURL != "" {
+				parts = append(parts, part)
+			}
+		}
+	}
+
+	if len(parts) == 0 {
+		return messages
+	}
+	messages[last].ContentParts = parts
+	return messages
+}
+
+func splitCommaList(raw string) []string {
+	if strings.TrimSpace(raw) == "" {
+		return nil
+	}
+	parts := strings.Split(raw, ",")
+	out := make([]string, 0, len(parts))
+	for _, p := range parts {
+		if s := strings.TrimSpace(p); s != "" {
+			out = append(out, s)
+		}
+	}
+	return out
+}
+
 // GetStartupInfo returns information about loaded tools and skills for logging.
 func (al *AgentLoop) compactSessionIfNeeded(sessionKey string) {
 	if !al.compactionEnabled {
--- a/pkg/agent/loop_responses_options_test.go
+++ b/pkg/agent/loop_responses_options_test.go
@@ -0,0 +1,78 @@
+package agent
+
+import (
+	"os"
+	"testing"
+
+	"clawgo/pkg/bus"
+	"clawgo/pkg/providers"
+)
+
+func TestInjectResponsesMediaParts(t *testing.T) {
+	msgs := []providers.Message{
+		{Role: "system", Content: "sys"},
+		{Role: "user", Content: "look"},
+	}
+	media := []string{"https://example.com/a.png"}
+	items := []bus.MediaItem{
+		{Type: "image", Ref: "file_img_1"},
+		{Type: "document", Ref: "file_doc_1"},
+	}
+
+	got := injectResponsesMediaParts(msgs, media, items)
+	if len(got) != 2 {
+		t.Fatalf("unexpected messages length: %#v", got)
+	}
+	parts := got[1].ContentParts
+	if len(parts) != 4 {
+		t.Fatalf("expected 4 content parts, got %#v", parts)
+	}
+	if parts[0].Type != "input_text" || parts[0].Text != "look" {
+		t.Fatalf("expected first part to preserve input text, got %#v", parts[0])
+	}
+	if parts[1].Type != "input_image" || parts[1].ImageURL == "" {
+		t.Fatalf("expected media URL as input_image, got %#v", parts[1])
+	}
+	if parts[2].Type != "input_image" || parts[2].FileID != "file_img_1" {
+		t.Fatalf("expected image media item mapped to file_id, got %#v", parts[2])
+	}
+	if parts[3].Type != "input_file" || parts[3].FileID != "file_doc_1" {
+		t.Fatalf("expected document media item mapped to input_file file_id, got %#v", parts[3])
+	}
+}
+
+func TestBuildResponsesOptionsFromEnv(t *testing.T) {
+	t.Setenv("CLAWGO_RESPONSES_WEB_SEARCH", "1")
+	t.Setenv("CLAWGO_RESPONSES_WEB_SEARCH_CONTEXT_SIZE", "high")
+	t.Setenv("CLAWGO_RESPONSES_FILE_SEARCH_VECTOR_STORE_IDS", "vs_1,vs_2")
+	t.Setenv("CLAWGO_RESPONSES_FILE_SEARCH_MAX_NUM_RESULTS", "8")
+	t.Setenv("CLAWGO_RESPONSES_INCLUDE", "output_text,tool_calls")
+	t.Setenv("CLAWGO_RESPONSES_STREAM_INCLUDE_USAGE", "1")
+
+	opts := buildResponsesOptions(1024, 0.2)
+	if opts["max_tokens"] != int64(1024) {
+		t.Fatalf("max_tokens mismatch: %#v", opts["max_tokens"])
+	}
+	if opts["temperature"] != 0.2 {
+		t.Fatalf("temperature mismatch: %#v", opts["temperature"])
+	}
+	toolsRaw, ok := opts["responses_tools"].([]map[string]interface{})
+	if !ok || len(toolsRaw) != 2 {
+		t.Fatalf("expected two built-in response tools, got %#v", opts["responses_tools"])
+	}
+	if toolsRaw[0]["type"] != "web_search" {
+		t.Fatalf("expected web_search tool first, got %#v", toolsRaw[0])
+	}
+	if toolsRaw[1]["type"] != "file_search" {
+		t.Fatalf("expected file_search tool second, got %#v", toolsRaw[1])
+	}
+	if _, ok := opts["responses_include"]; !ok {
+		t.Fatalf("expected responses_include in options")
+	}
+	if _, ok := opts["responses_stream_options"]; !ok {
+		t.Fatalf("expected responses_stream_options in options")
+	}
+
+	// keep linter happy for unused os import when build tags differ
+	_ = os.Getenv("CLAWGO_RESPONSES_WEB_SEARCH")
+}