diff --git a/internal/adapter/openai/message_normalize.go b/internal/adapter/openai/message_normalize.go index 299f908..bbc5800 100644 --- a/internal/adapter/openai/message_normalize.go +++ b/internal/adapter/openai/message_normalize.go @@ -132,6 +132,9 @@ func formatToolResultForPrompt(msg map[string]any) string { } func normalizeOpenAIContentForPrompt(v any) string { + if v == nil { + return "" + } switch x := v.(type) { case string: return x diff --git a/internal/adapter/openai/message_normalize_test.go b/internal/adapter/openai/message_normalize_test.go index ba17a52..a4e1843 100644 --- a/internal/adapter/openai/message_normalize_test.go +++ b/internal/adapter/openai/message_normalize_test.go @@ -194,6 +194,36 @@ func TestNormalizeOpenAIMessagesForPrompt_PreservesConcatenatedToolArguments(t * } } +func TestNormalizeOpenAIMessagesForPrompt_AssistantNilContentDoesNotInjectNullLiteral(t *testing.T) { + raw := []any{ + map[string]any{ + "role": "assistant", + "content": nil, + "tool_calls": []any{ + map[string]any{ + "id": "call_screenshot", + "function": map[string]any{ + "name": "send_file_to_user", + "arguments": `{"file_path":"/tmp/a.png"}`, + }, + }, + }, + }, + } + + normalized := normalizeOpenAIMessagesForPrompt(raw, "") + if len(normalized) != 1 { + t.Fatalf("expected one normalized message, got %d", len(normalized)) + } + content, _ := normalized[0]["content"].(string) + if strings.Contains(content, "<|Assistant|>null") || strings.HasPrefix(strings.TrimSpace(content), "null") { + t.Fatalf("unexpected null literal injected into assistant tool history: %q", content) + } + if !strings.Contains(content, "function.name: send_file_to_user") { + t.Fatalf("expected tool history block preserved, got %q", content) + } +} + func TestNormalizeOpenAIMessagesForPrompt_DeveloperRoleMapsToSystem(t *testing.T) { raw := []any{ map[string]any{"role": "developer", "content": "必须先走工具调用"},