Update version to v1.0.7

Author: dev2k6

README.md

@@ -4,7 +4,7 @@ OpenAI-compatible proxy server for the CommandCode API. It exposes `/v1/chat/com
 
 Repository: https://github.com/dev2k6/command-code-proxy-server
 
-Version: `v1.0.6`
+Version: `v1.0.7`
 
 ## Features
 
@@ -219,7 +219,7 @@ https://api.github.com/repos/dev2k6/command-code-proxy-server/tags
 If the latest GitHub tag is newer than the current app version, the version line is displayed as:
 
 ```text
-v1.0.6 (latest: v1.x.x)
+v1.0.7 (latest: v1.x.x)
 ```
 
 ## CommandCode version header

internal/api/commandcode.go

@@ -2,14 +2,22 @@ package api
 
 // CommandCode API types (internal)
 
+type CCToolOutput struct {
+	Type  string `json:"type"`
+	Value string `json:"value"`
+}
+
 type CCContentPart struct {
-	Type      string  `json:"type"`
-	Text      *string `json:"text,omitempty"`
-	ID        *string `json:"id,omitempty"`
-	Name      *string `json:"name,omitempty"`
-	Input     any     `json:"input,omitempty"`
-	ToolUseID *string `json:"tool_use_id,omitempty"`
-	Content   any     `json:"content,omitempty"`
+	Type       string        `json:"type"`
+	Text       *string       `json:"text,omitempty"`
+	ID         *string       `json:"id,omitempty"`
+	Name       *string       `json:"name,omitempty"`
+	Input      any           `json:"input,omitempty"`
+	ToolCallID *string       `json:"toolCallId,omitempty"`
+	ToolName   *string       `json:"toolName,omitempty"`
+	Output     *CCToolOutput `json:"output,omitempty"`
+	ToolUseID  *string       `json:"tool_use_id,omitempty"`
+	Content    any           `json:"content,omitempty"`
 }
 
 type CCMessage struct {

internal/proxy/convert.go

@@ -21,12 +21,28 @@ func ConvertMessages(openAIMsgs []api.OpenAIMessage) []api.CCMessage {
 		}
 
 		if m.Role == "tool" {
+			toolName := m.Name
+			if toolName == "" {
+				toolName = toolNames[m.ToolCallID]
+			}
+			if toolName == "" {
+				toolName = "unknown"
+			}
+			contentStr := contentToString(m.Content)
+			outputType := "text"
+			if strings.HasPrefix(contentStr, "Error:") {
+				outputType = "error-text"
+			}
 			ccMsgs = append(ccMsgs, api.CCMessage{
 				Role: "tool",
 				Content: []api.CCContentPart{{
-					Type:      "tool_result",
-					ToolUseID: strPtr(m.ToolCallID),
-					Content:   contentToString(m.Content),
+					Type:       "tool-result",
+					ToolCallID: strPtr(m.ToolCallID),
+					ToolName:   strPtr(toolName),
+					Output: &api.CCToolOutput{
+						Type:  outputType,
+						Value: contentStr,
+					},
 				}},
 			})
 			continue
@@ -225,7 +241,30 @@ func parseContent(content interface{}, toolNames map[string]string) []api.CCCont
 				if toolID == "" {
 					toolID, _ = partMap["toolCallId"].(string)
 				}
-				parts = append(parts, api.CCContentPart{Type: "tool_result", ToolUseID: strPtr(toolID), Content: contentPartToString(partMap["content"])})
+				toolName, _ := partMap["toolName"].(string)
+				if toolName == "" {
+					toolName = toolNames[toolID]
+				}
+				if toolName == "" {
+					toolName = "unknown"
+				}
+				contentVal := contentPartToString(partMap["content"])
+				if contentVal == "" {
+					contentVal = contentPartToString(partMap["output"])
+				}
+				outputType := "text"
+				if strings.HasPrefix(contentVal, "Error:") {
+					outputType = "error-text"
+				}
+				parts = append(parts, api.CCContentPart{
+					Type:       "tool-result",
+					ToolCallID: strPtr(toolID),
+					ToolName:   strPtr(toolName),
+					Output: &api.CCToolOutput{
+						Type:  outputType,
+						Value: contentVal,
+					},
+				})
 			}
 		}
 		return parts

main.go

@@ -9,7 +9,7 @@ import (
 	"github.com/dev2k6/command-code-proxy-server/internal/update"
 )
 
-const appVersion = "v1.0.6"
+const appVersion = "v1.0.7"
 const repositoryURL = "https://github.com/dev2k6/command-code-proxy-server"
 const debugLogging = false