Refactor content block types in SSEWriter and types package for improved clarity and structure

Author: leookun

internal/claude/sse.go

@@ -4,8 +4,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/gin-gonic/gin"
 	"puter2api/internal/types"
+
+	"github.com/gin-gonic/gin"
 )
 
 // SSEWriter SSE 写入器
@@ -47,7 +48,7 @@ func (w *SSEWriter) SendTextBlockStart(index int) {
 	w.SendEvent("content_block_start", types.ContentBlockStartEvent{
 		Type:         "content_block_start",
 		Index:        index,
-		ContentBlock: types.ContentBlock{Type: "text", Text: ""},
+		ContentBlock: types.TextContentBlock{Type: "text", Text: ""},
 	})
 }
 
@@ -65,7 +66,7 @@ func (w *SSEWriter) SendToolUseBlockStart(index int, id, name string) {
 	w.SendEvent("content_block_start", types.ContentBlockStartEvent{
 		Type:  "content_block_start",
 		Index: index,
-		ContentBlock: types.ContentBlock{
+		ContentBlock: types.ToolUseContentBlock{
 			Type:  "tool_use",
 			ID:    id,
 			Name:  name,
@@ -104,4 +105,3 @@ func (w *SSEWriter) SendMessageDelta(stopReason string, outputTokens int) {
 func (w *SSEWriter) SendMessageStop() {
 	w.SendEvent("message_stop", types.MessageStopEvent{Type: "message_stop"})
 }
-

internal/types/types.go

@@ -30,6 +30,20 @@ type ContentBlock struct {
 	Content   json.RawMessage `json:"content,omitempty"`
 }
 
+// TextContentBlock 文本内容块（text 字段始终存在）
+type TextContentBlock struct {
+	Type string `json:"type"`
+	Text string `json:"text"`
+}
+
+// ToolUseContentBlock 工具使用内容块
+type ToolUseContentBlock struct {
+	Type  string          `json:"type"`
+	ID    string          `json:"id"`
+	Name  string          `json:"name"`
+	Input json.RawMessage `json:"input"`
+}
+
 // Usage token 使用量
 type Usage struct {
 	InputTokens  int `json:"input_tokens"`
@@ -77,9 +91,9 @@ type MessageStartDetail struct {
 
 // ContentBlockStartEvent content_block_start 事件
 type ContentBlockStartEvent struct {
-	Type         string       `json:"type"`
-	Index        int          `json:"index"`
-	ContentBlock ContentBlock `json:"content_block"`
+	Type         string      `json:"type"`
+	Index        int         `json:"index"`
+	ContentBlock interface{} `json:"content_block"`
 }
 
 // ContentBlockDeltaEvent content_block_delta 事件