convert tool parts

Author: sawka

pkg/aiusechat/openaicomp/openaicomp-convertmessage.go

@@ -213,15 +213,48 @@ func ConvertAIChatToUIChat(aiChat uctypes.AIChat) (*uctypes.UIChat, error) {
 			continue
 		}
 
+		var parts []uctypes.UIMessagePart
+
+		// Add text content if present
+		if compMsg.Message.Content != "" {
+			parts = append(parts, uctypes.UIMessagePart{
+				Type: "text",
+				Text: compMsg.Message.Content,
+			})
+		}
+
+		// Add tool calls if present (assistant requesting tool use)
+		if len(compMsg.Message.ToolCalls) > 0 {
+			for _, toolCall := range compMsg.Message.ToolCalls {
+				if toolCall.Type != "function" {
+					continue
+				}
+
+				// Only add if ToolUseData is available
+				if toolCall.ToolUseData != nil {
+					parts = append(parts, uctypes.UIMessagePart{
+						Type: "data-tooluse",
+						ID:   toolCall.ID,
+						Data: *toolCall.ToolUseData,
+					})
+				}
+			}
+		}
+
+		// Tool result messages (role "tool") are not converted to UIMessage
+		if compMsg.Message.Role == "tool" && compMsg.Message.ToolCallID != "" {
+			continue
+		}
+
+		// Skip messages with no parts
+		if len(parts) == 0 {
+			continue
+		}
+
 		uiMsg := uctypes.UIMessage{
-			ID:   compMsg.MessageId,
-			Role: compMsg.Message.Role,
-			Parts: []uctypes.UIMessagePart{
-				{
-					Type: "text",
-					Text: compMsg.Message.Content,
-				},
-			},
+			ID:    compMsg.MessageId,
+			Role:  compMsg.Message.Role,
+			Parts: parts,
 		}
 
 		uiChat.Messages = append(uiChat.Messages, uiMsg)

pkg/aiusechat/openaicomp/openaicomp-types.go

@@ -28,6 +28,18 @@ type CompletionsMessage struct {
 	Name       string     `json:"name,omitempty"`         // tool name on role:"tool"
 }
 
+func (cm *CompletionsMessage) clean() *CompletionsMessage {
+	if len(cm.ToolCalls) == 0 {
+		return cm
+	}
+	rtn := *cm
+	rtn.ToolCalls = make([]ToolCall, len(cm.ToolCalls))
+	for i, tc := range cm.ToolCalls {
+		rtn.ToolCalls[i] = *tc.clean()
+	}
+	return &rtn
+}
+
 type ToolDefinition struct {
 	Type     string          `json:"type"` // "function"
 	Function ToolFunctionDef `json:"function"`
@@ -40,9 +52,19 @@ type ToolFunctionDef struct {
 }
 
 type ToolCall struct {
-	ID       string           `json:"id"`
-	Type     string           `json:"type"` // "function"
-	Function ToolFunctionCall `json:"function"`
+	ID          string                        `json:"id"`
+	Type        string                        `json:"type"` // "function"
+	Function    ToolFunctionCall              `json:"function"`
+	ToolUseData *uctypes.UIMessageDataToolUse `json:"toolusedata,omitempty"` // Internal field (must be cleaned before sending to API)
+}
+
+func (tc *ToolCall) clean() *ToolCall {
+	if tc.ToolUseData == nil {
+		return tc
+	}
+	rtn := *tc
+	rtn.ToolUseData = nil
+	return &rtn
 }
 
 type ToolFunctionCall struct {