Update version to v1.0.8

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.7`
+Version: `v1.0.8`
 
 ## 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.7 (latest: v1.x.x)
+v1.0.8 (latest: v1.x.x)
 ```
 
 ## CommandCode version header

internal/proxy/convert.go

@@ -50,13 +50,23 @@ func ConvertMessages(openAIMsgs []api.OpenAIMessage) []api.CCMessage {
 
 		if m.Role == "assistant" && len(m.ToolCalls) > 0 {
 			contentParts := parseContent(m.Content, toolNames)
+			addedTools := map[string]bool{}
+			for _, part := range contentParts {
+				if part.Type == "tool-call" && part.ToolCallID != nil {
+					addedTools[*part.ToolCallID] = true
+				}
+			}
 			for _, tc := range m.ToolCalls {
+				if addedTools[tc.ID] {
+					continue
+				}
 				contentParts = append(contentParts, api.CCContentPart{
-					Type:  "tool_use",
-					ID:    strPtr(tc.ID),
-					Name:  strPtr(tc.Function.Name),
-					Input: parseToolInput(tc.Function.Arguments),
+					Type:       "tool-call",
+					ToolCallID: strPtr(tc.ID),
+					ToolName:   strPtr(tc.Function.Name),
+					Input:      parseToolInput(tc.Function.Arguments),
 				})
+				addedTools[tc.ID] = true
 			}
 			ccMsgs = append(ccMsgs, api.CCMessage{Role: m.Role, Content: contentParts})
 			continue
@@ -218,24 +228,31 @@ func parseContent(content interface{}, toolNames map[string]string) []api.CCCont
 				if text := contentPartToString(partMap); text != "" {
 					parts = append(parts, api.CCContentPart{Type: "text", Text: strPtr(text)})
 				}
-			case "tool_use":
+			case "tool_use", "tool-call":
 				id, _ := partMap["id"].(string)
-				name, _ := partMap["name"].(string)
-				if id != "" && name != "" {
-					toolNames[id] = name
+				if id == "" {
+					id, _ = partMap["toolCallId"].(string)
+				}
+				if id == "" {
+					id, _ = partMap["tool_use_id"].(string)
 				}
-				parts = append(parts, api.CCContentPart{Type: "tool_use", ID: strPtr(id), Name: strPtr(name), Input: partMap["input"]})
-			case "tool-call":
-				id, _ := partMap["id"].(string)
 				name, _ := partMap["name"].(string)
+				if name == "" {
+					name, _ = partMap["toolName"].(string)
+				}
 				if id != "" && name != "" {
 					toolNames[id] = name
 				}
 				input := partMap["input"]
 				if input == nil {
 					input = partMap["arguments"]
 				}
-				parts = append(parts, api.CCContentPart{Type: "tool-call", ID: strPtr(id), Name: strPtr(name), Input: input})
+				parts = append(parts, api.CCContentPart{
+					Type:       "tool-call",
+					ToolCallID: strPtr(id),
+					ToolName:   strPtr(name),
+					Input:      input,
+				})
 			case "tool_result", "tool-result":
 				toolID, _ := partMap["tool_use_id"].(string)
 				if toolID == "" {

main.go

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