convert to role "tool" messages

Author: sawka

pkg/aiusechat/openaicomp/openaicomp-convertmessage.go

@@ -197,6 +197,36 @@ func ConvertAIMessageToCompletionsMessage(aiMsg uctypes.AIMessage) (*Completions
 	}, nil
 }
 
+// ConvertToolResultsToNativeChatMessage converts tool results to OpenAI tool messages
+func ConvertToolResultsToNativeChatMessage(toolResults []uctypes.AIToolResult) ([]uctypes.GenAIMessage, error) {
+	if len(toolResults) == 0 {
+		return nil, nil
+	}
+
+	messages := make([]uctypes.GenAIMessage, 0, len(toolResults))
+	for _, toolResult := range toolResults {
+		var content string
+		if toolResult.ErrorText != "" {
+			content = fmt.Sprintf("Error: %s", toolResult.ErrorText)
+		} else {
+			content = toolResult.Text
+		}
+
+		msg := &CompletionsChatMessage{
+			MessageId: toolResult.ToolUseID,
+			Message: CompletionsMessage{
+				Role:       "tool",
+				ToolCallID: toolResult.ToolUseID,
+				Name:       toolResult.ToolName,
+				Content:    content,
+			},
+		}
+		messages = append(messages, msg)
+	}
+
+	return messages, nil
+}
+
 // ConvertAIChatToUIChat converts stored chat to UI format
 func ConvertAIChatToUIChat(aiChat uctypes.AIChat) (*uctypes.UIChat, error) {
 	uiChat := &uctypes.UIChat{

pkg/aiusechat/usechat-backend.go

@@ -145,7 +145,7 @@ func (b *openaiCompletionsBackend) UpdateToolUseData(chatId string, toolCallId s
 }
 
 func (b *openaiCompletionsBackend) ConvertToolResultsToNativeChatMessage(toolResults []uctypes.AIToolResult) ([]uctypes.GenAIMessage, error) {
-	return nil, fmt.Errorf("tools not supported in openai-comp backend")
+	return openaicomp.ConvertToolResultsToNativeChatMessage(toolResults)
 }
 
 func (b *openaiCompletionsBackend) ConvertAIMessageToNativeChatMessage(message uctypes.AIMessage) (uctypes.GenAIMessage, error) {

pkg/aiusechat/usechat.go

@@ -422,16 +422,16 @@ func RunAIChat(ctx context.Context, sseHandler *sse.SSEHandlerCh, backend UseCha
 				chatOpts.PlatformInfo = platformInfo
 			}
 		}
-		stopReason, rtnMessage, err := runAIChatStep(ctx, sseHandler, backend, chatOpts, cont)
+		stopReason, rtnMessages, err := runAIChatStep(ctx, sseHandler, backend, chatOpts, cont)
 		metrics.RequestCount++
 		if chatOpts.Config.IsPremiumModel() {
 			metrics.PremiumReqCount++
 		}
 		if chatOpts.Config.IsWaveProxy() {
 			metrics.ProxyReqCount++
 		}
-		if len(rtnMessage) > 0 {
-			usage := getUsage(rtnMessage)
+		if len(rtnMessages) > 0 {
+			usage := getUsage(rtnMessages)
 			log.Printf("usage: input=%d output=%d websearch=%d\n", usage.InputTokens, usage.OutputTokens, usage.NativeWebSearchCount)
 			metrics.Usage.InputTokens += usage.InputTokens
 			metrics.Usage.OutputTokens += usage.OutputTokens
@@ -450,7 +450,7 @@ func RunAIChat(ctx context.Context, sseHandler *sse.SSEHandlerCh, backend UseCha
 			_ = sseHandler.AiMsgFinish("", nil)
 			break
 		}
-		for _, msg := range rtnMessage {
+		for _, msg := range rtnMessages {
 			if msg != nil {
 				chatstore.DefaultChatStore.PostMessage(chatOpts.ChatId, &chatOpts.Config, msg)
 			}