From 0e261ff0a0d54058df7ead7fec155c68ebcce463 Mon Sep 17 00:00:00 2001
From: "CJACK." <tetr20071102@gmail.com>
Date: Fri, 6 Mar 2026 18:25:27 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=BD=92=E4=B8=80=E5=8C=96=E9=80=BB=E8=BE=91=E5=B9=B6?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=20nil=20=E5=9B=9E=E5=BD=92=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/adapter/openai/message_normalize.go | 31 ++------------------
 internal/prompt/messages.go                  |  3 ++
 internal/prompt/messages_test.go             | 23 +++++++++++++++
 3 files changed, 28 insertions(+), 29 deletions(-)
 create mode 100644 internal/prompt/messages_test.go

diff --git a/internal/adapter/openai/message_normalize.go b/internal/adapter/openai/message_normalize.go
index bbc5800..724cb9f 100644
--- a/internal/adapter/openai/message_normalize.go
+++ b/internal/adapter/openai/message_normalize.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"ds2api/internal/config"
+	"ds2api/internal/prompt"
 )
 
 func normalizeOpenAIMessagesForPrompt(raw []any, traceID string) []map[string]any {
@@ -132,35 +133,7 @@ func formatToolResultForPrompt(msg map[string]any) string {
 }
 
 func normalizeOpenAIContentForPrompt(v any) string {
-	if v == nil {
-		return ""
-	}
-	switch x := v.(type) {
-	case string:
-		return x
-	case []any:
-		parts := make([]string, 0, len(x))
-		for _, item := range x {
-			m, ok := item.(map[string]any)
-			if !ok {
-				continue
-			}
-			t := strings.ToLower(strings.TrimSpace(asString(m["type"])))
-			if t != "text" && t != "output_text" && t != "input_text" {
-				continue
-			}
-			if text := asString(m["text"]); text != "" {
-				parts = append(parts, text)
-				continue
-			}
-			if text := asString(m["content"]); text != "" {
-				parts = append(parts, text)
-			}
-		}
-		return strings.Join(parts, "\n")
-	default:
-		return marshalToPromptString(v)
-	}
+	return prompt.NormalizeContent(v)
 }
 
 func normalizeOpenAIArgumentsForPrompt(v any) string {
diff --git a/internal/prompt/messages.go b/internal/prompt/messages.go
index 69cfe5a..5e124b4 100644
--- a/internal/prompt/messages.go
+++ b/internal/prompt/messages.go
@@ -51,6 +51,9 @@ func MessagesPrepare(messages []map[string]any) string {
 }
 
 func NormalizeContent(v any) string {
+	if v == nil {
+		return ""
+	}
 	switch x := v.(type) {
 	case string:
 		return x
diff --git a/internal/prompt/messages_test.go b/internal/prompt/messages_test.go
new file mode 100644
index 0000000..0407552
--- /dev/null
+++ b/internal/prompt/messages_test.go
@@ -0,0 +1,23 @@
+package prompt
+
+import "testing"
+
+func TestNormalizeContentNilReturnsEmpty(t *testing.T) {
+	if got := NormalizeContent(nil); got != "" {
+		t.Fatalf("expected empty string for nil content, got %q", got)
+	}
+}
+
+func TestMessagesPrepareNilContentNoNullLiteral(t *testing.T) {
+	messages := []map[string]any{
+		{"role": "assistant", "content": nil},
+		{"role": "user", "content": "ok"},
+	}
+	got := MessagesPrepare(messages)
+	if got == "" {
+		t.Fatalf("expected non-empty output")
+	}
+	if got == "null" {
+		t.Fatalf("expected no null literal output, got %q", got)
+	}
+}