v6 version first commit

internal/translator/claude/gemini-cli/claude_gemini-cli_request.go

@@ -8,7 +8,8 @@ package geminiCLI
 import (
 	"bytes"
 
-	. "github.com/luispater/CLIProxyAPI/v5/internal/translator/claude/gemini"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/claude/gemini"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -30,6 +31,7 @@ import (
 // Returns:
 //   - []byte: The transformed request data in Claude Code API format
 func ConvertGeminiCLIRequestToClaude(modelName string, inputRawJSON []byte, stream bool) []byte {
+	log.Debug("ConvertGeminiCLIRequestToClaude")
 	rawJSON := bytes.Clone(inputRawJSON)
 
 	modelResult := gjson.GetBytes(rawJSON, "model")

internal/translator/claude/gemini-cli/claude_gemini-cli_response.go

@@ -7,7 +7,8 @@ package geminiCLI
 import (
 	"context"
 
-	. "github.com/luispater/CLIProxyAPI/v5/internal/translator/claude/gemini"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/claude/gemini"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/sjson"
 )
 
@@ -25,6 +26,7 @@ import (
 // Returns:
 //   - []string: A slice of strings, each containing a Gemini-compatible JSON response wrapped in a response object
 func ConvertClaudeResponseToGeminiCLI(ctx context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertClaudeResponseToGeminiCLI")
 	outputs := ConvertClaudeResponseToGemini(ctx, modelName, originalRequestRawJSON, requestRawJSON, rawJSON, param)
 	// Wrap each converted response in a "response" object to match Gemini CLI API structure
 	newOutputs := make([]string, 0)
@@ -49,6 +51,7 @@ func ConvertClaudeResponseToGeminiCLI(ctx context.Context, modelName string, ori
 // Returns:
 //   - string: A Gemini-compatible JSON response wrapped in a response object
 func ConvertClaudeResponseToGeminiCLINonStream(ctx context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) string {
+	log.Debug("ConvertClaudeResponseToGeminiCLINonStream")
 	strJSON := ConvertClaudeResponseToGeminiNonStream(ctx, modelName, originalRequestRawJSON, requestRawJSON, rawJSON, param)
 	// Wrap the converted response in a "response" object to match Gemini CLI API structure
 	json := `{"response": {}}`

internal/translator/claude/gemini-cli/init.go

@@ -1,9 +1,9 @@
 package geminiCLI
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/claude/gemini/claude_gemini_request.go

@@ -12,7 +12,8 @@ import (
 	"math/big"
 	"strings"
 
-	"github.com/luispater/CLIProxyAPI/v5/internal/util"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/util"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -36,6 +37,7 @@ import (
 // Returns:
 //   - []byte: The transformed request data in Claude Code API format
 func ConvertGeminiRequestToClaude(modelName string, inputRawJSON []byte, stream bool) []byte {
+	log.Debug("ConvertGeminiRequestToClaude")
 	rawJSON := bytes.Clone(inputRawJSON)
 	// Base Claude Code API template with default max_tokens value
 	out := `{"model":"","max_tokens":32000,"messages":[]}`

internal/translator/claude/gemini/claude_gemini_response.go

@@ -12,12 +12,13 @@ import (
 	"strings"
 	"time"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
 
 var (
-	dataTag = []byte("data: ")
+	dataTag = []byte("data:")
 )
 
 // ConvertAnthropicResponseToGeminiParams holds parameters for response conversion
@@ -53,6 +54,7 @@ type ConvertAnthropicResponseToGeminiParams struct {
 // Returns:
 //   - []string: A slice of strings, each containing a Gemini-compatible JSON response
 func ConvertClaudeResponseToGemini(_ context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertClaudeResponseToGemini")
 	if *param == nil {
 		*param = &ConvertAnthropicResponseToGeminiParams{
 			Model:      modelName,
@@ -64,7 +66,7 @@ func ConvertClaudeResponseToGemini(_ context.Context, modelName string, original
 	if !bytes.HasPrefix(rawJSON, dataTag) {
 		return []string{}
 	}
-	rawJSON = rawJSON[6:]
+	rawJSON = bytes.TrimSpace(rawJSON[5:])
 
 	root := gjson.ParseBytes(rawJSON)
 	eventType := root.Get("type").String()
@@ -321,6 +323,7 @@ func convertMapToJSON(m map[string]interface{}) string {
 // Returns:
 //   - string: A Gemini-compatible JSON response containing all message content and metadata
 func ConvertClaudeResponseToGeminiNonStream(_ context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) string {
+	log.Debug("ConvertClaudeResponseToGeminiNonStream")
 	// Base Gemini response template for non-streaming with default values
 	template := `{"candidates":[{"content":{"role":"model","parts":[]},"finishReason":"STOP"}],"usageMetadata":{"trafficType":"PROVISIONED_THROUGHPUT"},"modelVersion":"","createTime":"","responseId":""}`
 
@@ -336,7 +339,7 @@ func ConvertClaudeResponseToGeminiNonStream(_ context.Context, modelName string,
 		line := scanner.Bytes()
 		// log.Debug(string(line))
 		if bytes.HasPrefix(line, dataTag) {
-			jsonData := line[6:]
+			jsonData := bytes.TrimSpace(line[5:])
 			streamingEvents = append(streamingEvents, jsonData)
 		}
 	}

internal/translator/claude/gemini/init.go

@@ -1,9 +1,9 @@
 package gemini
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/claude/openai/chat-completions/claude_openai_request.go

@@ -12,6 +12,7 @@ import (
 	"math/big"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -34,6 +35,7 @@ import (
 // Returns:
 //   - []byte: The transformed request data in Claude Code API format
 func ConvertOpenAIRequestToClaude(modelName string, inputRawJSON []byte, stream bool) []byte {
+	log.Debug("ConvertOpenAIRequestToClaude")
 	rawJSON := bytes.Clone(inputRawJSON)
 
 	// Base Claude Code API template with default max_tokens value

internal/translator/claude/openai/chat-completions/claude_openai_response.go

@@ -13,12 +13,13 @@ import (
 	"strings"
 	"time"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
 
 var (
-	dataTag = []byte("data: ")
+	dataTag = []byte("data:")
 )
 
 // ConvertAnthropicResponseToOpenAIParams holds parameters for response conversion
@@ -51,6 +52,7 @@ type ToolCallAccumulator struct {
 // Returns:
 //   - []string: A slice of strings, each containing an OpenAI-compatible JSON response
 func ConvertClaudeResponseToOpenAI(_ context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertClaudeResponseToOpenAI")
 	if *param == nil {
 		*param = &ConvertAnthropicResponseToOpenAIParams{
 			CreatedAt:    0,
@@ -62,7 +64,7 @@ func ConvertClaudeResponseToOpenAI(_ context.Context, modelName string, original
 	if !bytes.HasPrefix(rawJSON, dataTag) {
 		return []string{}
 	}
-	rawJSON = rawJSON[6:]
+	rawJSON = bytes.TrimSpace(rawJSON[5:])
 
 	root := gjson.ParseBytes(rawJSON)
 	eventType := root.Get("type").String()
@@ -278,6 +280,8 @@ func mapAnthropicStopReasonToOpenAI(anthropicReason string) string {
 // Returns:
 //   - string: An OpenAI-compatible JSON response containing all message content and metadata
 func ConvertClaudeResponseToOpenAINonStream(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) string {
+	log.Debug("ConvertClaudeResponseToOpenAINonStream")
+
 	chunks := make([][]byte, 0)
 
 	scanner := bufio.NewScanner(bytes.NewReader(rawJSON))
@@ -289,7 +293,7 @@ func ConvertClaudeResponseToOpenAINonStream(_ context.Context, _ string, origina
 		if !bytes.HasPrefix(line, dataTag) {
 			continue
 		}
-		chunks = append(chunks, line[6:])
+		chunks = append(chunks, bytes.TrimSpace(rawJSON[5:]))
 	}
 
 	// Base OpenAI non-streaming response template

internal/translator/claude/openai/chat-completions/init.go

@@ -1,9 +1,9 @@
 package chat_completions
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/claude/openai/responses/claude_openai-responses_request.go

@@ -6,6 +6,7 @@ import (
 	"math/big"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -21,6 +22,7 @@ import (
 // - max_output_tokens -> max_tokens
 // - stream passthrough via parameter
 func ConvertOpenAIResponsesRequestToClaude(modelName string, inputRawJSON []byte, stream bool) []byte {
+	log.Debug("ConvertOpenAIResponsesRequestToClaude")
 	rawJSON := bytes.Clone(inputRawJSON)
 
 	// Base Claude message payload

internal/translator/claude/openai/responses/claude_openai-responses_response.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 	"time"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -34,14 +35,15 @@ type claudeToResponsesState struct {
 	ReasoningIndex     int
 }
 
-var dataTag = []byte("data: ")
+var dataTag = []byte("data:")
 
 func emitEvent(event string, payload string) string {
-	return fmt.Sprintf("event: %s\ndata: %s\n\n", event, payload)
+	return fmt.Sprintf("event: %s\ndata: %s", event, payload)
 }
 
 // ConvertClaudeResponseToOpenAIResponses converts Claude SSE to OpenAI Responses SSE events.
 func ConvertClaudeResponseToOpenAIResponses(ctx context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertClaudeResponseToOpenAIResponses")
 	if *param == nil {
 		*param = &claudeToResponsesState{FuncArgsBuf: make(map[int]*strings.Builder), FuncNames: make(map[int]string), FuncCallIDs: make(map[int]string)}
 	}
@@ -51,7 +53,7 @@ func ConvertClaudeResponseToOpenAIResponses(ctx context.Context, modelName strin
 	if !bytes.HasPrefix(rawJSON, dataTag) {
 		return []string{}
 	}
-	rawJSON = rawJSON[6:]
+	rawJSON = bytes.TrimSpace(rawJSON[5:])
 	root := gjson.ParseBytes(rawJSON)
 	ev := root.Get("type").String()
 	var out []string
@@ -389,6 +391,7 @@ func ConvertClaudeResponseToOpenAIResponses(ctx context.Context, modelName strin
 
 // ConvertClaudeResponseToOpenAIResponsesNonStream aggregates Claude SSE into a single OpenAI Responses JSON.
 func ConvertClaudeResponseToOpenAIResponsesNonStream(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) string {
+	log.Debug("ConvertClaudeResponseToOpenAIResponsesNonStream")
 	// Aggregate Claude SSE lines into a single OpenAI Responses JSON (non-stream)
 	// We follow the same aggregation logic as the streaming variant but produce
 	// one final object matching docs/out.json structure.

internal/translator/claude/openai/responses/init.go

@@ -1,9 +1,9 @@
 package responses
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/codex/claude/codex_claude_request.go

@@ -11,7 +11,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/luispater/CLIProxyAPI/v5/internal/misc"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/misc"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -35,6 +36,7 @@ import (
 // Returns:
 //   - []byte: The transformed request data in internal client format
 func ConvertClaudeRequestToCodex(modelName string, inputRawJSON []byte, _ bool) []byte {
+	log.Debug("ConvertClaudeRequestToCodex")
 	rawJSON := bytes.Clone(inputRawJSON)
 
 	template := `{"model":"","instructions":"","input":[]}`

internal/translator/codex/claude/codex_claude_response.go

@@ -11,12 +11,13 @@ import (
 	"context"
 	"fmt"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
 
 var (
-	dataTag = []byte("data: ")
+	dataTag = []byte("data:")
 )
 
 // ConvertCodexResponseToClaude performs sophisticated streaming response format conversion.
@@ -36,6 +37,7 @@ var (
 // Returns:
 //   - []string: A slice of strings, each containing a Claude Code-compatible JSON response
 func ConvertCodexResponseToClaude(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertCodexResponseToClaude")
 	if *param == nil {
 		hasToolCall := false
 		*param = &hasToolCall
@@ -45,7 +47,7 @@ func ConvertCodexResponseToClaude(_ context.Context, _ string, originalRequestRa
 	if !bytes.HasPrefix(rawJSON, dataTag) {
 		return []string{}
 	}
-	rawJSON = rawJSON[6:]
+	rawJSON = bytes.TrimSpace(rawJSON[5:])
 
 	output := ""
 	rootResult := gjson.ParseBytes(rawJSON)
@@ -177,6 +179,7 @@ func ConvertCodexResponseToClaude(_ context.Context, _ string, originalRequestRa
 // Returns:
 //   - string: A Claude Code-compatible JSON response containing all message content and metadata
 func ConvertCodexResponseToClaudeNonStream(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, _ []byte, _ *any) string {
+	log.Debug("ConvertCodexResponseToClaudeNonStream")
 	return ""
 }
 

internal/translator/codex/claude/init.go

@@ -1,9 +1,9 @@
 package claude
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/codex/gemini-cli/codex_gemini-cli_request.go

@@ -8,7 +8,8 @@ package geminiCLI
 import (
 	"bytes"
 
-	. "github.com/luispater/CLIProxyAPI/v5/internal/translator/codex/gemini"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/codex/gemini"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -30,6 +31,7 @@ import (
 // Returns:
 //   - []byte: The transformed request data in Codex API format
 func ConvertGeminiCLIRequestToCodex(modelName string, inputRawJSON []byte, stream bool) []byte {
+	log.Debug("ConvertGeminiRequestToCodex")
 	rawJSON := bytes.Clone(inputRawJSON)
 
 	rawJSON = []byte(gjson.GetBytes(rawJSON, "request").Raw)

internal/translator/codex/gemini-cli/codex_gemini-cli_response.go

@@ -7,7 +7,8 @@ package geminiCLI
 import (
 	"context"
 
-	. "github.com/luispater/CLIProxyAPI/v5/internal/translator/codex/gemini"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/codex/gemini"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/sjson"
 )
 
@@ -25,6 +26,7 @@ import (
 // Returns:
 //   - []string: A slice of strings, each containing a Gemini-compatible JSON response wrapped in a response object
 func ConvertCodexResponseToGeminiCLI(ctx context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertCodexResponseToGeminiCLI")
 	outputs := ConvertCodexResponseToGemini(ctx, modelName, originalRequestRawJSON, requestRawJSON, rawJSON, param)
 	newOutputs := make([]string, 0)
 	for i := 0; i < len(outputs); i++ {
@@ -48,6 +50,7 @@ func ConvertCodexResponseToGeminiCLI(ctx context.Context, modelName string, orig
 // Returns:
 //   - string: A Gemini-compatible JSON response wrapped in a response object
 func ConvertCodexResponseToGeminiCLINonStream(ctx context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) string {
+	log.Debug("ConvertCodexResponseToGeminiCLINonStream")
 	// log.Debug(string(rawJSON))
 	strJSON := ConvertCodexResponseToGeminiNonStream(ctx, modelName, originalRequestRawJSON, requestRawJSON, rawJSON, param)
 	json := `{"response": {}}`

internal/translator/codex/gemini-cli/init.go

@@ -1,9 +1,9 @@
 package geminiCLI
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/codex/gemini/codex_gemini_request.go

@@ -13,8 +13,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/luispater/CLIProxyAPI/v5/internal/misc"
-	"github.com/luispater/CLIProxyAPI/v5/internal/util"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/misc"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/util"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -37,6 +38,7 @@ import (
 // Returns:
 //   - []byte: The transformed request data in Codex API format
 func ConvertGeminiRequestToCodex(modelName string, inputRawJSON []byte, _ bool) []byte {
+	log.Debug("ConvertGeminiRequestToCodex")
 	rawJSON := bytes.Clone(inputRawJSON)
 	// Base template
 	out := `{"model":"","instructions":"","input":[]}`

internal/translator/codex/gemini/codex_gemini_response.go

@@ -11,12 +11,13 @@ import (
 	"encoding/json"
 	"time"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
 
 var (
-	dataTag = []byte("data: ")
+	dataTag = []byte("data:")
 )
 
 // ConvertCodexResponseToGeminiParams holds parameters for response conversion.
@@ -41,6 +42,7 @@ type ConvertCodexResponseToGeminiParams struct {
 // Returns:
 //   - []string: A slice of strings, each containing a Gemini-compatible JSON response
 func ConvertCodexResponseToGemini(_ context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertCodexResponseToGemini")
 	if *param == nil {
 		*param = &ConvertCodexResponseToGeminiParams{
 			Model:             modelName,
@@ -53,7 +55,7 @@ func ConvertCodexResponseToGemini(_ context.Context, modelName string, originalR
 	if !bytes.HasPrefix(rawJSON, dataTag) {
 		return []string{}
 	}
-	rawJSON = rawJSON[6:]
+	rawJSON = bytes.TrimSpace(rawJSON[5:])
 
 	rootResult := gjson.ParseBytes(rawJSON)
 	typeResult := rootResult.Get("type")
@@ -152,6 +154,7 @@ func ConvertCodexResponseToGemini(_ context.Context, modelName string, originalR
 // Returns:
 //   - string: A Gemini-compatible JSON response containing all message content and metadata
 func ConvertCodexResponseToGeminiNonStream(_ context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) string {
+	log.Debug("ConvertCodexResponseToGeminiNonStream")
 	scanner := bufio.NewScanner(bytes.NewReader(rawJSON))
 	buffer := make([]byte, 10240*1024)
 	scanner.Buffer(buffer, 10240*1024)
@@ -161,7 +164,7 @@ func ConvertCodexResponseToGeminiNonStream(_ context.Context, modelName string,
 		if !bytes.HasPrefix(line, dataTag) {
 			continue
 		}
-		rawJSON = line[6:]
+		rawJSON = bytes.TrimSpace(rawJSON[5:])
 
 		rootResult := gjson.ParseBytes(rawJSON)
 

internal/translator/codex/gemini/init.go

@@ -1,9 +1,9 @@
 package gemini
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/codex/openai/chat-completions/codex_openai_request.go

@@ -12,7 +12,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/luispater/CLIProxyAPI/v5/internal/misc"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/misc"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -30,10 +31,10 @@ import (
 // Returns:
 //   - []byte: The transformed request data in OpenAI Responses API format
 func ConvertOpenAIRequestToCodex(modelName string, inputRawJSON []byte, stream bool) []byte {
+	log.Debug("ConvertOpenAIRequestToCodex")
 	rawJSON := bytes.Clone(inputRawJSON)
 	// Start with empty JSON object
 	out := `{}`
-	store := false
 
 	// Stream must be set to true
 	out, _ = sjson.Set(out, "stream", stream)
@@ -305,7 +306,7 @@ func ConvertOpenAIRequestToCodex(modelName string, inputRawJSON []byte, stream b
 		}
 	}
 
-	out, _ = sjson.Set(out, "store", store)
+	out, _ = sjson.Set(out, "store", false)
 	return []byte(out)
 }
 

internal/translator/codex/openai/chat-completions/codex_openai_response.go

@@ -11,12 +11,13 @@ import (
 	"context"
 	"time"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
 
 var (
-	dataTag = []byte("data: ")
+	dataTag = []byte("data:")
 )
 
 // ConvertCliToOpenAIParams holds parameters for response conversion.
@@ -42,6 +43,7 @@ type ConvertCliToOpenAIParams struct {
 // Returns:
 //   - []string: A slice of strings, each containing an OpenAI-compatible JSON response
 func ConvertCodexResponseToOpenAI(_ context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertCodexResponseToOpenAI")
 	if *param == nil {
 		*param = &ConvertCliToOpenAIParams{
 			Model:             modelName,
@@ -54,7 +56,7 @@ func ConvertCodexResponseToOpenAI(_ context.Context, modelName string, originalR
 	if !bytes.HasPrefix(rawJSON, dataTag) {
 		return []string{}
 	}
-	rawJSON = rawJSON[6:]
+	rawJSON = bytes.TrimSpace(rawJSON[5:])
 
 	// Initialize the OpenAI SSE template.
 	template := `{"id":"","object":"chat.completion.chunk","created":12345,"model":"model","choices":[{"index":0,"delta":{"role":null,"content":null,"reasoning_content":null,"tool_calls":null},"finish_reason":null,"native_finish_reason":null}]}`
@@ -166,6 +168,7 @@ func ConvertCodexResponseToOpenAI(_ context.Context, modelName string, originalR
 // Returns:
 //   - string: An OpenAI-compatible JSON response containing all message content and metadata
 func ConvertCodexResponseToOpenAINonStream(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) string {
+	log.Debug("ConvertCodexResponseToOpenAINonStream")
 	scanner := bufio.NewScanner(bytes.NewReader(rawJSON))
 	buffer := make([]byte, 10240*1024)
 	scanner.Buffer(buffer, 10240*1024)
@@ -175,7 +178,7 @@ func ConvertCodexResponseToOpenAINonStream(_ context.Context, _ string, original
 		if !bytes.HasPrefix(line, dataTag) {
 			continue
 		}
-		rawJSON = line[6:]
+		rawJSON = bytes.TrimSpace(rawJSON[5:])
 
 		rootResult := gjson.ParseBytes(rawJSON)
 		// Verify this is a response.completed event

internal/translator/codex/openai/chat-completions/init.go

@@ -1,9 +1,9 @@
 package chat_completions
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/codex/openai/responses/codex_openai-responses_request.go

@@ -3,12 +3,14 @@ package responses
 import (
 	"bytes"
 
-	"github.com/luispater/CLIProxyAPI/v5/internal/misc"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/misc"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
 
 func ConvertOpenAIResponsesRequestToCodex(modelName string, inputRawJSON []byte, _ bool) []byte {
+	log.Debug("ConvertOpenAIResponsesRequestToCodex")
 	rawJSON := bytes.Clone(inputRawJSON)
 
 	rawJSON, _ = sjson.SetBytes(rawJSON, "stream", true)

internal/translator/codex/openai/responses/codex_openai-responses_response.go

@@ -6,6 +6,7 @@ import (
 	"context"
 	"fmt"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -13,8 +14,9 @@ import (
 // ConvertCodexResponseToOpenAIResponses converts OpenAI Chat Completions streaming chunks
 // to OpenAI Responses SSE events (response.*).
 func ConvertCodexResponseToOpenAIResponses(ctx context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
-	if bytes.HasPrefix(rawJSON, []byte("data: ")) {
-		rawJSON = rawJSON[6:]
+	log.Debug("ConvertCodexResponseToOpenAIResponses")
+	if bytes.HasPrefix(rawJSON, []byte("data:")) {
+		rawJSON = bytes.TrimSpace(rawJSON[5:])
 		if typeResult := gjson.GetBytes(rawJSON, "type"); typeResult.Exists() {
 			typeStr := typeResult.String()
 			if typeStr == "response.created" || typeStr == "response.in_progress" || typeStr == "response.completed" {
@@ -29,27 +31,31 @@ func ConvertCodexResponseToOpenAIResponses(ctx context.Context, modelName string
 // ConvertCodexResponseToOpenAIResponsesNonStream builds a single Responses JSON
 // from a non-streaming OpenAI Chat Completions response.
 func ConvertCodexResponseToOpenAIResponsesNonStream(_ context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) string {
+	log.Debug("ConvertCodexResponseToOpenAIResponsesNonStream")
 	scanner := bufio.NewScanner(bytes.NewReader(rawJSON))
 	buffer := make([]byte, 10240*1024)
 	scanner.Buffer(buffer, 10240*1024)
-	dataTag := []byte("data: ")
+	dataTag := []byte("data:")
 	for scanner.Scan() {
 		line := scanner.Bytes()
 
 		if !bytes.HasPrefix(line, dataTag) {
 			continue
 		}
-		rawJSON = line[6:]
+		line = bytes.TrimSpace(line[5:])
 
-		rootResult := gjson.ParseBytes(rawJSON)
+		rootResult := gjson.ParseBytes(line)
 		// Verify this is a response.completed event
+
 		if rootResult.Get("type").String() != "response.completed" {
+
 			continue
 		}
 		responseResult := rootResult.Get("response")
 		template := responseResult.Raw
 
 		template, _ = sjson.Set(template, "instructions", gjson.GetBytes(originalRequestRawJSON, "instructions").String())
+
 		return template
 	}
 	return ""

internal/translator/codex/openai/responses/init.go

@@ -1,9 +1,9 @@
 package responses
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/gemini-cli/claude/gemini-cli_claude_request.go

@@ -10,8 +10,9 @@ import (
 	"encoding/json"
 	"strings"
 
-	client "github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/util"
+	client "github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/util"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -35,6 +36,7 @@ import (
 // Returns:
 //   - []byte: The transformed request data in Gemini CLI API format
 func ConvertClaudeRequestToCLI(modelName string, inputRawJSON []byte, _ bool) []byte {
+	log.Debug("ConvertClaudeRequestToCLI")
 	rawJSON := bytes.Clone(inputRawJSON)
 	var pathsToDelete []string
 	root := gjson.ParseBytes(rawJSON)

internal/translator/gemini-cli/claude/gemini-cli_claude_response.go

@@ -12,6 +12,7 @@ import (
 	"fmt"
 	"time"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -42,6 +43,7 @@ type Params struct {
 // Returns:
 //   - []string: A slice of strings, each containing a Claude Code-compatible JSON response
 func ConvertGeminiCLIResponseToClaude(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertGeminiCLIResponseToClaude")
 	if *param == nil {
 		*param = &Params{
 			HasFirstResponse: false,
@@ -252,5 +254,6 @@ func ConvertGeminiCLIResponseToClaude(_ context.Context, _ string, originalReque
 // Returns:
 //   - string: A Claude-compatible JSON response.
 func ConvertGeminiCLIResponseToClaudeNonStream(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, _ []byte, _ *any) string {
+	log.Debug("ConvertGeminiCLIResponseToClaudeNonStream")
 	return ""
 }

internal/translator/gemini-cli/claude/init.go

@@ -1,9 +1,9 @@
 package claude
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/gemini-cli/gemini/gemini-cli_gemini_request.go

@@ -32,6 +32,7 @@ import (
 // Returns:
 //   - []byte: The transformed request data in Gemini API format
 func ConvertGeminiRequestToGeminiCLI(_ string, inputRawJSON []byte, _ bool) []byte {
+	log.Debug("ConvertGeminiRequestToGeminiCLI")
 	rawJSON := bytes.Clone(inputRawJSON)
 	template := ""
 	template = `{"project":"","request":{},"model":""}`

internal/translator/gemini-cli/gemini/gemini_gemini-cli_request.go

@@ -8,6 +8,7 @@ package gemini
 import (
 	"context"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -29,6 +30,7 @@ import (
 // Returns:
 //   - []string: The transformed request data in Gemini API format
 func ConvertGeminiCliRequestToGemini(ctx context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) []string {
+	log.Debug("ConvertGeminiCliRequestToGemini")
 	if alt, ok := ctx.Value("alt").(string); ok {
 		var chunk []byte
 		if alt == "" {
@@ -68,6 +70,7 @@ func ConvertGeminiCliRequestToGemini(ctx context.Context, _ string, originalRequ
 // Returns:
 //   - string: A Gemini-compatible JSON response containing the response data
 func ConvertGeminiCliRequestToGeminiNonStream(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) string {
+	log.Debug("ConvertGeminiCliRequestToGeminiNonStream")
 	responseResult := gjson.GetBytes(rawJSON, "response")
 	if responseResult.Exists() {
 		return responseResult.Raw

internal/translator/gemini-cli/gemini/init.go

@@ -1,9 +1,9 @@
 package gemini
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/gemini-cli/openai/chat-completions/cli_openai_request.go

@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/luispater/CLIProxyAPI/v5/internal/misc"
-	"github.com/luispater/CLIProxyAPI/v5/internal/util"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/misc"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/util"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
@@ -25,6 +25,7 @@ import (
 // Returns:
 //   - []byte: The transformed request data in Gemini CLI API format
 func ConvertOpenAIRequestToGeminiCLI(modelName string, inputRawJSON []byte, _ bool) []byte {
+	log.Debug("ConvertOpenAIRequestToGeminiCLI")
 	rawJSON := bytes.Clone(inputRawJSON)
 	// Base envelope
 	out := []byte(`{"project":"","request":{"contents":[],"generationConfig":{"thinkingConfig":{"include_thoughts":true}}},"model":"gemini-2.5-pro"}`)

internal/translator/gemini-cli/openai/chat-completions/cli_openai_response.go

@@ -11,7 +11,8 @@ import (
 	"fmt"
 	"time"
 
-	. "github.com/luispater/CLIProxyAPI/v5/internal/translator/gemini/openai/chat-completions"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini/openai/chat-completions"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -36,6 +37,7 @@ type convertCliResponseToOpenAIChatParams struct {
 // Returns:
 //   - []string: A slice of strings, each containing an OpenAI-compatible JSON response
 func ConvertCliResponseToOpenAI(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertCliResponseToOpenAI")
 	if *param == nil {
 		*param = &convertCliResponseToOpenAIChatParams{
 			UnixTimestamp: 0,
@@ -146,6 +148,7 @@ func ConvertCliResponseToOpenAI(_ context.Context, _ string, originalRequestRawJ
 // Returns:
 //   - string: An OpenAI-compatible JSON response containing all message content and metadata
 func ConvertCliResponseToOpenAINonStream(ctx context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) string {
+	log.Debug("ConvertCliResponseToOpenAINonStream")
 	responseResult := gjson.GetBytes(rawJSON, "response")
 	if responseResult.Exists() {
 		return ConvertGeminiResponseToOpenAINonStream(ctx, modelName, originalRequestRawJSON, requestRawJSON, []byte(responseResult.Raw), param)

internal/translator/gemini-cli/openai/chat-completions/init.go

@@ -1,9 +1,9 @@
 package chat_completions
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/gemini-cli/openai/responses/cli_openai-responses_request.go

@@ -3,11 +3,13 @@ package responses
 import (
 	"bytes"
 
-	. "github.com/luispater/CLIProxyAPI/v5/internal/translator/gemini-cli/gemini"
-	. "github.com/luispater/CLIProxyAPI/v5/internal/translator/gemini/openai/responses"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini-cli/gemini"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini/openai/responses"
+	log "github.com/sirupsen/logrus"
 )
 
 func ConvertOpenAIResponsesRequestToGeminiCLI(modelName string, inputRawJSON []byte, stream bool) []byte {
+	log.Debug("ConvertOpenAIResponsesRequestToGeminiCLI")
 	rawJSON := bytes.Clone(inputRawJSON)
 	rawJSON = ConvertOpenAIResponsesRequestToGemini(modelName, rawJSON, stream)
 	return ConvertGeminiRequestToGeminiCLI(modelName, rawJSON, stream)

internal/translator/gemini-cli/openai/responses/cli_openai-responses_response.go

@@ -3,11 +3,13 @@ package responses
 import (
 	"context"
 
-	. "github.com/luispater/CLIProxyAPI/v5/internal/translator/gemini/openai/responses"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini/openai/responses"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 )
 
 func ConvertGeminiCLIResponseToOpenAIResponses(ctx context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertGeminiCLIResponseToOpenAIResponses")
 	responseResult := gjson.GetBytes(rawJSON, "response")
 	if responseResult.Exists() {
 		rawJSON = []byte(responseResult.Raw)
@@ -16,6 +18,7 @@ func ConvertGeminiCLIResponseToOpenAIResponses(ctx context.Context, modelName st
 }
 
 func ConvertGeminiCLIResponseToOpenAIResponsesNonStream(ctx context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) string {
+	log.Debug("ConvertGeminiCLIResponseToOpenAIResponsesNonStream")
 	responseResult := gjson.GetBytes(rawJSON, "response")
 	if responseResult.Exists() {
 		rawJSON = []byte(responseResult.Raw)

internal/translator/gemini-cli/openai/responses/init.go

@@ -1,9 +1,9 @@
 package responses
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/gemini-web/openai/chat-completions/init.go

@@ -0,0 +1,20 @@
+package chat_completions
+
+import (
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	geminiChat "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini/openai/chat-completions"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
+)
+
+func init() {
+	translator.Register(
+		OPENAI,
+		GEMINIWEB,
+		geminiChat.ConvertOpenAIRequestToGemini,
+		interfaces.TranslateResponse{
+			Stream:    geminiChat.ConvertGeminiResponseToOpenAI,
+			NonStream: geminiChat.ConvertGeminiResponseToOpenAINonStream,
+		},
+	)
+}

internal/translator/gemini-web/openai/responses/init.go

@@ -0,0 +1,20 @@
+package responses
+
+import (
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	geminiResponses "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini/openai/responses"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
+)
+
+func init() {
+	translator.Register(
+		OPENAI_RESPONSE,
+		GEMINIWEB,
+		geminiResponses.ConvertOpenAIResponsesRequestToGemini,
+		interfaces.TranslateResponse{
+			Stream:    geminiResponses.ConvertGeminiResponseToOpenAIResponses,
+			NonStream: geminiResponses.ConvertGeminiResponseToOpenAIResponsesNonStream,
+		},
+	)
+}

internal/translator/gemini/claude/gemini_claude_request.go

@@ -10,8 +10,9 @@ import (
 	"encoding/json"
 	"strings"
 
-	client "github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/util"
+	client "github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/util"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -28,6 +29,7 @@ import (
 // Returns:
 //   - []byte: The transformed request in Gemini CLI format.
 func ConvertClaudeRequestToGemini(modelName string, inputRawJSON []byte, _ bool) []byte {
+	log.Debug("ConvertClaudeRequestToGemini")
 	rawJSON := bytes.Clone(inputRawJSON)
 	var pathsToDelete []string
 	root := gjson.ParseBytes(rawJSON)

internal/translator/gemini/claude/gemini_claude_response.go

@@ -12,6 +12,7 @@ import (
 	"fmt"
 	"time"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -41,6 +42,7 @@ type Params struct {
 // Returns:
 //   - []string: A slice of strings, each containing a Claude-compatible JSON response.
 func ConvertGeminiResponseToClaude(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertGeminiResponseToClaude")
 	if *param == nil {
 		*param = &Params{
 			IsGlAPIKey:       false,
@@ -246,5 +248,6 @@ func ConvertGeminiResponseToClaude(_ context.Context, _ string, originalRequestR
 // Returns:
 //   - string: A Claude-compatible JSON response.
 func ConvertGeminiResponseToClaudeNonStream(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, _ []byte, _ *any) string {
+	log.Debug("ConvertGeminiResponseToClaudeNonStream")
 	return ""
 }

internal/translator/gemini/claude/init.go

@@ -1,9 +1,9 @@
 package claude
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/gemini/gemini-cli/gemini_gemini-cli_request.go

@@ -8,6 +8,7 @@ package geminiCLI
 import (
 	"bytes"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -16,6 +17,7 @@ import (
 // It extracts the model name, system instruction, message contents, and tool declarations
 // from the raw JSON request and returns them in the format expected by the internal client.
 func ConvertGeminiCLIRequestToGemini(_ string, inputRawJSON []byte, _ bool) []byte {
+	log.Debug("ConvertGeminiCLIRequestToGemini")
 	rawJSON := bytes.Clone(inputRawJSON)
 	modelResult := gjson.GetBytes(rawJSON, "model")
 	rawJSON = []byte(gjson.GetBytes(rawJSON, "request").Raw)

internal/translator/gemini/gemini-cli/gemini_gemini-cli_response.go

@@ -8,6 +8,7 @@ import (
 	"bytes"
 	"context"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/sjson"
 )
 
@@ -25,6 +26,7 @@ import (
 // Returns:
 //   - []string: A slice of strings, each containing a Gemini CLI-compatible JSON response.
 func ConvertGeminiResponseToGeminiCLI(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) []string {
+	log.Debug("ConvertGeminiResponseToGeminiCLI")
 	if bytes.Equal(rawJSON, []byte("[DONE]")) {
 		return []string{}
 	}
@@ -44,6 +46,7 @@ func ConvertGeminiResponseToGeminiCLI(_ context.Context, _ string, originalReque
 // Returns:
 //   - string: A Gemini CLI-compatible JSON response.
 func ConvertGeminiResponseToGeminiCLINonStream(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) string {
+	log.Debug("ConvertGeminiResponseToGeminiCLINonStream")
 	json := `{"response": {}}`
 	rawJSON, _ = sjson.SetRawBytes([]byte(json), "response", rawJSON)
 	return string(rawJSON)

internal/translator/gemini/gemini-cli/init.go

@@ -1,9 +1,9 @@
 package geminiCLI
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/gemini/gemini/gemini_gemini_request.go

@@ -7,6 +7,7 @@ import (
 	"bytes"
 	"fmt"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -17,6 +18,7 @@ import (
 //
 // It keeps the payload otherwise unchanged.
 func ConvertGeminiRequestToGemini(_ string, inputRawJSON []byte, _ bool) []byte {
+	log.Debug("ConvertClaudeRequestToGemini")
 	rawJSON := bytes.Clone(inputRawJSON)
 	// Fast path: if no contents field, return as-is
 	contents := gjson.GetBytes(rawJSON, "contents")

internal/translator/gemini/gemini/gemini_gemini_response.go

@@ -3,17 +3,27 @@ package gemini
 import (
 	"bytes"
 	"context"
+
+	log "github.com/sirupsen/logrus"
 )
 
 // PassthroughGeminiResponseStream forwards Gemini responses unchanged.
 func PassthroughGeminiResponseStream(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) []string {
+	log.Debug("PassthroughGeminiResponseStream")
+
+	if bytes.HasPrefix(rawJSON, []byte("data:")) {
+		rawJSON = bytes.TrimSpace(rawJSON[5:])
+	}
+
 	if bytes.Equal(rawJSON, []byte("[DONE]")) {
 		return []string{}
 	}
+
 	return []string{string(rawJSON)}
 }
 
 // PassthroughGeminiResponseNonStream forwards Gemini responses unchanged.
 func PassthroughGeminiResponseNonStream(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) string {
+	log.Debug("PassthroughGeminiResponseNonStream")
 	return string(rawJSON)
 }

internal/translator/gemini/gemini/init.go

@@ -1,9 +1,9 @@
 package gemini
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 // Register a no-op response translator and a request normalizer for Gemini→Gemini.

internal/translator/gemini/openai/chat-completions/gemini_openai_request.go

@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/luispater/CLIProxyAPI/v5/internal/misc"
-	"github.com/luispater/CLIProxyAPI/v5/internal/util"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/misc"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/util"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
@@ -25,6 +25,7 @@ import (
 // Returns:
 //   - []byte: The transformed request data in Gemini API format
 func ConvertOpenAIRequestToGemini(modelName string, inputRawJSON []byte, _ bool) []byte {
+	log.Debug("ConvertOpenAIRequestToGemini")
 	rawJSON := bytes.Clone(inputRawJSON)
 	// Base envelope
 	out := []byte(`{"contents":[],"generationConfig":{"thinkingConfig":{"include_thoughts":true}}}`)
@@ -170,6 +171,31 @@ func ConvertOpenAIRequestToGemini(modelName string, inputRawJSON []byte, _ bool)
 					node := []byte(`{"role":"model","parts":[{"text":""}]}`)
 					node, _ = sjson.SetBytes(node, "parts.0.text", content.String())
 					out, _ = sjson.SetRawBytes(out, "contents.-1", node)
+				} else if content.IsArray() {
+					// Assistant multimodal content (e.g. text + image) -> single model content with parts
+					node := []byte(`{"role":"model","parts":[]}`)
+					p := 0
+					for _, item := range content.Array() {
+						switch item.Get("type").String() {
+						case "text":
+							node, _ = sjson.SetBytes(node, "parts."+itoa(p)+".text", item.Get("text").String())
+							p++
+						case "image_url":
+							// If the assistant returned an inline data URL, preserve it for history fidelity.
+							imageURL := item.Get("image_url.url").String()
+							if len(imageURL) > 5 { // expect data:...
+								pieces := strings.SplitN(imageURL[5:], ";", 2)
+								if len(pieces) == 2 && len(pieces[1]) > 7 {
+									mime := pieces[0]
+									data := pieces[1][7:]
+									node, _ = sjson.SetBytes(node, "parts."+itoa(p)+".inlineData.mime_type", mime)
+									node, _ = sjson.SetBytes(node, "parts."+itoa(p)+".inlineData.data", data)
+									p++
+								}
+							}
+						}
+					}
+					out, _ = sjson.SetRawBytes(out, "contents.-1", node)
 				} else if !content.Exists() || content.Type == gjson.Null {
 					// Tool calls -> single model content with functionCall parts
 					tcs := m.Get("tool_calls")

internal/translator/gemini/openai/chat-completions/gemini_openai_response.go

@@ -8,9 +8,11 @@ package chat_completions
 import (
 	"bytes"
 	"context"
+	"encoding/json"
 	"fmt"
 	"time"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -35,6 +37,7 @@ type convertGeminiResponseToOpenAIChatParams struct {
 // Returns:
 //   - []string: A slice of strings, each containing an OpenAI-compatible JSON response
 func ConvertGeminiResponseToOpenAI(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertGeminiResponseToOpenAI")
 	if *param == nil {
 		*param = &convertGeminiResponseToOpenAIChatParams{
 			UnixTimestamp: 0,
@@ -99,6 +102,10 @@ func ConvertGeminiResponseToOpenAI(_ context.Context, _ string, originalRequestR
 			partResult := partResults[i]
 			partTextResult := partResult.Get("text")
 			functionCallResult := partResult.Get("functionCall")
+			inlineDataResult := partResult.Get("inlineData")
+			if !inlineDataResult.Exists() {
+				inlineDataResult = partResult.Get("inline_data")
+			}
 
 			if partTextResult.Exists() {
 				// Handle text content, distinguishing between regular content and reasoning/thoughts.
@@ -124,6 +131,34 @@ func ConvertGeminiResponseToOpenAI(_ context.Context, _ string, originalRequestR
 				}
 				template, _ = sjson.Set(template, "choices.0.delta.role", "assistant")
 				template, _ = sjson.SetRaw(template, "choices.0.delta.tool_calls.-1", functionCallTemplate)
+			} else if inlineDataResult.Exists() {
+				data := inlineDataResult.Get("data").String()
+				if data == "" {
+					continue
+				}
+				mimeType := inlineDataResult.Get("mimeType").String()
+				if mimeType == "" {
+					mimeType = inlineDataResult.Get("mime_type").String()
+				}
+				if mimeType == "" {
+					mimeType = "image/png"
+				}
+				imageURL := fmt.Sprintf("data:%s;base64,%s", mimeType, data)
+				imagePayload, err := json.Marshal(map[string]any{
+					"type": "image_url",
+					"image_url": map[string]string{
+						"url": imageURL,
+					},
+				})
+				if err != nil {
+					continue
+				}
+				imagesResult := gjson.Get(template, "choices.0.delta.images")
+				if !imagesResult.Exists() || !imagesResult.IsArray() {
+					template, _ = sjson.SetRaw(template, "choices.0.delta.images", `[]`)
+				}
+				template, _ = sjson.Set(template, "choices.0.delta.role", "assistant")
+				template, _ = sjson.SetRaw(template, "choices.0.delta.images.-1", string(imagePayload))
 			}
 		}
 	}
@@ -145,6 +180,7 @@ func ConvertGeminiResponseToOpenAI(_ context.Context, _ string, originalRequestR
 // Returns:
 //   - string: An OpenAI-compatible JSON response containing all message content and metadata
 func ConvertGeminiResponseToOpenAINonStream(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) string {
+	log.Debug("ConvertGeminiResponseToOpenAINonStream")
 	var unixTimestamp int64
 	template := `{"id":"","object":"chat.completion","created":123456,"model":"model","choices":[{"index":0,"message":{"role":"assistant","content":null,"reasoning_content":null,"tool_calls":null},"finish_reason":null,"native_finish_reason":null}]}`
 	if modelVersionResult := gjson.GetBytes(rawJSON, "modelVersion"); modelVersionResult.Exists() {
@@ -193,6 +229,10 @@ func ConvertGeminiResponseToOpenAINonStream(_ context.Context, _ string, origina
 			partResult := partsResults[i]
 			partTextResult := partResult.Get("text")
 			functionCallResult := partResult.Get("functionCall")
+			inlineDataResult := partResult.Get("inlineData")
+			if !inlineDataResult.Exists() {
+				inlineDataResult = partResult.Get("inline_data")
+			}
 
 			if partTextResult.Exists() {
 				// Append text content, distinguishing between regular content and reasoning.
@@ -217,9 +257,34 @@ func ConvertGeminiResponseToOpenAINonStream(_ context.Context, _ string, origina
 				}
 				template, _ = sjson.Set(template, "choices.0.message.role", "assistant")
 				template, _ = sjson.SetRaw(template, "choices.0.message.tool_calls.-1", functionCallItemTemplate)
-			} else {
-				// If no usable content is found, return an empty string.
-				return ""
+			} else if inlineDataResult.Exists() {
+				data := inlineDataResult.Get("data").String()
+				if data == "" {
+					continue
+				}
+				mimeType := inlineDataResult.Get("mimeType").String()
+				if mimeType == "" {
+					mimeType = inlineDataResult.Get("mime_type").String()
+				}
+				if mimeType == "" {
+					mimeType = "image/png"
+				}
+				imageURL := fmt.Sprintf("data:%s;base64,%s", mimeType, data)
+				imagePayload, err := json.Marshal(map[string]any{
+					"type": "image_url",
+					"image_url": map[string]string{
+						"url": imageURL,
+					},
+				})
+				if err != nil {
+					continue
+				}
+				imagesResult := gjson.Get(template, "choices.0.message.images")
+				if !imagesResult.Exists() || !imagesResult.IsArray() {
+					template, _ = sjson.SetRaw(template, "choices.0.message.images", `[]`)
+				}
+				template, _ = sjson.Set(template, "choices.0.message.role", "assistant")
+				template, _ = sjson.SetRaw(template, "choices.0.message.images.-1", string(imagePayload))
 			}
 		}
 	}

internal/translator/gemini/openai/chat-completions/init.go

@@ -1,9 +1,9 @@
 package chat_completions
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/gemini/openai/responses/gemini_openai-responses_request.go

@@ -4,11 +4,13 @@ import (
 	"bytes"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
 
 func ConvertOpenAIResponsesRequestToGemini(modelName string, inputRawJSON []byte, stream bool) []byte {
+	log.Debug("ConvertOpenAIResponsesRequestToGemini")
 	rawJSON := bytes.Clone(inputRawJSON)
 
 	// Note: modelName and stream parameters are part of the fixed method signature

internal/translator/gemini/openai/responses/gemini_openai-responses_response.go

@@ -1,11 +1,13 @@
 package responses
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"strings"
 	"time"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -37,11 +39,12 @@ type geminiToResponsesState struct {
 }
 
 func emitEvent(event string, payload string) string {
-	return fmt.Sprintf("event: %s\ndata: %s\n\n", event, payload)
+	return fmt.Sprintf("event: %s\ndata: %s", event, payload)
 }
 
 // ConvertGeminiResponseToOpenAIResponses converts Gemini SSE chunks into OpenAI Responses SSE events.
 func ConvertGeminiResponseToOpenAIResponses(_ context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertGeminiResponseToOpenAIResponses")
 	if *param == nil {
 		*param = &geminiToResponsesState{
 			FuncArgsBuf: make(map[int]*strings.Builder),
@@ -51,6 +54,10 @@ func ConvertGeminiResponseToOpenAIResponses(_ context.Context, modelName string,
 	}
 	st := (*param).(*geminiToResponsesState)
 
+	if bytes.HasPrefix(rawJSON, []byte("data:")) {
+		rawJSON = bytes.TrimSpace(rawJSON[5:])
+	}
+
 	root := gjson.ParseBytes(rawJSON)
 	if !root.Exists() {
 		return []string{}
@@ -417,6 +424,7 @@ func ConvertGeminiResponseToOpenAIResponses(_ context.Context, modelName string,
 
 // ConvertGeminiResponseToOpenAIResponsesNonStream aggregates Gemini response JSON into a single OpenAI Responses JSON object.
 func ConvertGeminiResponseToOpenAIResponsesNonStream(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) string {
+	log.Debug("ConvertGeminiResponseToOpenAIResponsesNonStream")
 	root := gjson.ParseBytes(rawJSON)
 
 	// Base response scaffold
@@ -456,7 +464,7 @@ func ConvertGeminiResponseToOpenAIResponsesNonStream(_ context.Context, _ string
 		}
 		if v := req.Get("model"); v.Exists() {
 			resp, _ = sjson.Set(resp, "model", v.String())
-		} else if v := root.Get("modelVersion"); v.Exists() {
+		} else if v = root.Get("modelVersion"); v.Exists() {
 			resp, _ = sjson.Set(resp, "model", v.String())
 		}
 		if v := req.Get("parallel_tool_calls"); v.Exists() {

internal/translator/gemini/openai/responses/init.go

@@ -1,9 +1,9 @@
 package responses
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/init.go

@@ -1,30 +1,34 @@
 package translator
 
 import (
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/claude/gemini"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/claude/gemini-cli"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/claude/openai/chat-completions"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/claude/openai/responses"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/claude/gemini"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/claude/gemini-cli"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/claude/openai/chat-completions"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/claude/openai/responses"
 
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/codex/claude"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/codex/gemini"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/codex/gemini-cli"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/codex/openai/chat-completions"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/codex/openai/responses"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/codex/claude"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/codex/gemini"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/codex/gemini-cli"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/codex/openai/chat-completions"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/codex/openai/responses"
 
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/gemini-cli/claude"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/gemini-cli/gemini"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/gemini-cli/openai/chat-completions"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/gemini-cli/openai/responses"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini-cli/claude"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini-cli/gemini"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini-cli/openai/chat-completions"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini-cli/openai/responses"
 
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/gemini/claude"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/gemini/gemini"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/gemini/gemini-cli"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/gemini/openai/chat-completions"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/gemini/openai/responses"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini/claude"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini/gemini"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini/gemini-cli"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini/openai/chat-completions"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini/openai/responses"
 
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/openai/claude"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/openai/gemini"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/openai/gemini-cli"
-	_ "github.com/luispater/CLIProxyAPI/v5/internal/translator/openai/openai/responses"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini-web/openai/chat-completions"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/gemini-web/openai/responses"
+
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/openai/claude"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/openai/gemini"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/openai/gemini-cli"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/openai/openai/chat-completions"
+	_ "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/openai/openai/responses"
 )

internal/translator/openai/claude/init.go

@@ -1,9 +1,9 @@
 package claude
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/openai/claude/openai_claude_request.go

@@ -10,6 +10,7 @@ import (
 	"encoding/json"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -18,6 +19,7 @@ import (
 // It extracts the model name, system instruction, message contents, and tool declarations
 // from the raw JSON request and returns them in the format expected by the OpenAI API.
 func ConvertClaudeRequestToOpenAI(modelName string, inputRawJSON []byte, stream bool) []byte {
+	log.Debug("ConvertClaudeRequestToOpenAI")
 	rawJSON := bytes.Clone(inputRawJSON)
 	// Base OpenAI Chat Completions API template
 	out := `{"model":"","messages":[]}`

internal/translator/openai/claude/openai_claude_response.go

@@ -6,14 +6,20 @@
 package claude
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"strings"
 
-	"github.com/luispater/CLIProxyAPI/v5/internal/util"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/util"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 )
 
+var (
+	dataTag = []byte("data:")
+)
+
 // ConvertOpenAIResponseToAnthropicParams holds parameters for response conversion
 type ConvertOpenAIResponseToAnthropicParams struct {
 	MessageID string
@@ -53,6 +59,7 @@ type ToolCallAccumulator struct {
 // Returns:
 //   - []string: A slice of strings, each containing an Anthropic-compatible JSON response.
 func ConvertOpenAIResponseToClaude(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertOpenAIResponseToClaude")
 	if *param == nil {
 		*param = &ConvertOpenAIResponseToAnthropicParams{
 			MessageID:               "",
@@ -67,6 +74,11 @@ func ConvertOpenAIResponseToClaude(_ context.Context, _ string, originalRequestR
 		}
 	}
 
+	if !bytes.HasPrefix(rawJSON, dataTag) {
+		return []string{}
+	}
+	rawJSON = bytes.TrimSpace(rawJSON[5:])
+
 	// Check if this is the [DONE] marker
 	rawStr := strings.TrimSpace(string(rawJSON))
 	if rawStr == "[DONE]" {
@@ -441,5 +453,6 @@ func mapOpenAIFinishReasonToAnthropic(openAIReason string) string {
 // Returns:
 //   - string: An Anthropic-compatible JSON response.
 func ConvertOpenAIResponseToClaudeNonStream(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, _ []byte, _ *any) string {
+	log.Debug("ConvertOpenAIResponseToClaudeNonStream")
 	return ""
 }

internal/translator/openai/gemini-cli/init.go

@@ -1,9 +1,9 @@
 package geminiCLI
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/openai/gemini-cli/openai_gemini_request.go

@@ -8,7 +8,8 @@ package geminiCLI
 import (
 	"bytes"
 
-	. "github.com/luispater/CLIProxyAPI/v5/internal/translator/openai/gemini"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/openai/gemini"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -17,6 +18,7 @@ import (
 // It extracts the model name, generation config, message contents, and tool declarations
 // from the raw JSON request and returns them in the format expected by the OpenAI API.
 func ConvertGeminiCLIRequestToOpenAI(modelName string, inputRawJSON []byte, stream bool) []byte {
+	log.Debug("ConvertGeminiCLIRequestToOpenAI")
 	rawJSON := bytes.Clone(inputRawJSON)
 	rawJSON = []byte(gjson.GetBytes(rawJSON, "request").Raw)
 	rawJSON, _ = sjson.SetBytes(rawJSON, "model", modelName)

internal/translator/openai/gemini-cli/openai_gemini_response.go

@@ -8,7 +8,8 @@ package geminiCLI
 import (
 	"context"
 
-	. "github.com/luispater/CLIProxyAPI/v5/internal/translator/openai/gemini"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/translator/openai/gemini"
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/sjson"
 )
 
@@ -25,6 +26,7 @@ import (
 // Returns:
 //   - []string: A slice of strings, each containing a Gemini-compatible JSON response.
 func ConvertOpenAIResponseToGeminiCLI(ctx context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertOpenAIResponseToGeminiCLI")
 	outputs := ConvertOpenAIResponseToGemini(ctx, modelName, originalRequestRawJSON, requestRawJSON, rawJSON, param)
 	newOutputs := make([]string, 0)
 	for i := 0; i < len(outputs); i++ {
@@ -46,6 +48,7 @@ func ConvertOpenAIResponseToGeminiCLI(ctx context.Context, modelName string, ori
 // Returns:
 //   - string: A Gemini-compatible JSON response.
 func ConvertOpenAIResponseToGeminiCLINonStream(ctx context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) string {
+	log.Debug("ConvertOpenAIResponseToGeminiCLINonStream")
 	strJSON := ConvertOpenAIResponseToGeminiNonStream(ctx, modelName, originalRequestRawJSON, requestRawJSON, rawJSON, param)
 	json := `{"response": {}}`
 	strJSON, _ = sjson.SetRaw(json, "response", strJSON)

internal/translator/openai/gemini/init.go

@@ -1,9 +1,9 @@
 package gemini
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/openai/gemini/openai_gemini_request.go

@@ -12,6 +12,7 @@ import (
 	"math/big"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -20,6 +21,7 @@ import (
 // It extracts the model name, generation config, message contents, and tool declarations
 // from the raw JSON request and returns them in the format expected by the OpenAI API.
 func ConvertGeminiRequestToOpenAI(modelName string, inputRawJSON []byte, stream bool) []byte {
+	log.Debug("ConvertGeminiRequestToOpenAI")
 	rawJSON := bytes.Clone(inputRawJSON)
 	// Base OpenAI Chat Completions API template
 	out := `{"model":"","messages":[]}`

internal/translator/openai/gemini/openai_gemini_response.go

@@ -6,11 +6,13 @@
 package gemini
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"strconv"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -45,6 +47,7 @@ type ToolCallAccumulator struct {
 // Returns:
 //   - []string: A slice of strings, each containing a Gemini-compatible JSON response.
 func ConvertOpenAIResponseToGemini(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertOpenAIResponseToGemini")
 	if *param == nil {
 		*param = &ConvertOpenAIResponseToGeminiParams{
 			ToolCallsAccumulator: nil,
@@ -58,6 +61,10 @@ func ConvertOpenAIResponseToGemini(_ context.Context, _ string, originalRequestR
 		return []string{}
 	}
 
+	if bytes.HasPrefix(rawJSON, []byte("data:")) {
+		rawJSON = bytes.TrimSpace(rawJSON[5:])
+	}
+
 	root := gjson.ParseBytes(rawJSON)
 
 	// Initialize accumulators if needed
@@ -507,6 +514,7 @@ func tryParseNumber(s string) (interface{}, bool) {
 // Returns:
 //   - string: A Gemini-compatible JSON response.
 func ConvertOpenAIResponseToGeminiNonStream(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) string {
+	log.Debug("ConvertOpenAIResponseToGeminiNonStream")
 	root := gjson.ParseBytes(rawJSON)
 
 	// Base Gemini response template

internal/translator/openai/openai/chat-completions/init.go

@@ -0,0 +1,19 @@
+package chat_completions
+
+import (
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
+)
+
+func init() {
+	translator.Register(
+		OPENAI,
+		OPENAI,
+		ConvertOpenAIRequestToOpenAI,
+		interfaces.TranslateResponse{
+			Stream:    ConvertOpenAIResponseToOpenAI,
+			NonStream: ConvertOpenAIResponseToOpenAINonStream,
+		},
+	)
+}

internal/translator/openai/openai/chat-completions/openai_openai_request.go

@@ -0,0 +1,24 @@
+// Package openai provides request translation functionality for OpenAI to Gemini CLI API compatibility.
+// It converts OpenAI Chat Completions requests into Gemini CLI compatible JSON using gjson/sjson only.
+package chat_completions
+
+import (
+	"bytes"
+
+	log "github.com/sirupsen/logrus"
+)
+
+// ConvertOpenAIRequestToOpenAI converts an OpenAI Chat Completions request (raw JSON)
+// into a complete Gemini CLI request JSON. All JSON construction uses sjson and lookups use gjson.
+//
+// Parameters:
+//   - modelName: The name of the model to use for the request
+//   - rawJSON: The raw JSON request data from the OpenAI API
+//   - stream: A boolean indicating if the request is for a streaming response (unused in current implementation)
+//
+// Returns:
+//   - []byte: The transformed request data in Gemini CLI API format
+func ConvertOpenAIRequestToOpenAI(modelName string, inputRawJSON []byte, _ bool) []byte {
+	log.Debug("ConvertOpenAIRequestToOpenAI")
+	return bytes.Clone(inputRawJSON)
+}

internal/translator/openai/openai/chat-completions/openai_openai_response.go

@@ -0,0 +1,56 @@
+// Package openai provides response translation functionality for Gemini CLI to OpenAI API compatibility.
+// This package handles the conversion of Gemini CLI API responses into OpenAI Chat Completions-compatible
+// JSON format, transforming streaming events and non-streaming responses into the format
+// expected by OpenAI API clients. It supports both streaming and non-streaming modes,
+// handling text content, tool calls, reasoning content, and usage metadata appropriately.
+package chat_completions
+
+import (
+	"bytes"
+	"context"
+
+	log "github.com/sirupsen/logrus"
+)
+
+// ConvertOpenAIResponseToOpenAI translates a single chunk of a streaming response from the
+// Gemini CLI API format to the OpenAI Chat Completions streaming format.
+// It processes various Gemini CLI event types and transforms them into OpenAI-compatible JSON responses.
+// The function handles text content, tool calls, reasoning content, and usage metadata, outputting
+// responses that match the OpenAI API format. It supports incremental updates for streaming responses.
+//
+// Parameters:
+//   - ctx: The context for the request, used for cancellation and timeout handling
+//   - modelName: The name of the model being used for the response (unused in current implementation)
+//   - rawJSON: The raw JSON response from the Gemini CLI API
+//   - param: A pointer to a parameter object for maintaining state between calls
+//
+// Returns:
+//   - []string: A slice of strings, each containing an OpenAI-compatible JSON response
+func ConvertOpenAIResponseToOpenAI(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertOpenAIResponseToOpenAI")
+	if bytes.HasPrefix(rawJSON, []byte("data:")) {
+		rawJSON = bytes.TrimSpace(rawJSON[5:])
+	}
+	if bytes.Equal(rawJSON, []byte("[DONE]")) {
+		return []string{}
+	}
+	return []string{string(rawJSON)}
+}
+
+// ConvertOpenAIResponseToOpenAINonStream converts a non-streaming Gemini CLI response to a non-streaming OpenAI response.
+// This function processes the complete Gemini CLI response and transforms it into a single OpenAI-compatible
+// JSON response. It handles message content, tool calls, reasoning content, and usage metadata, combining all
+// the information into a single response that matches the OpenAI API format.
+//
+// Parameters:
+//   - ctx: The context for the request, used for cancellation and timeout handling
+//   - modelName: The name of the model being used for the response
+//   - rawJSON: The raw JSON response from the Gemini CLI API
+//   - param: A pointer to a parameter object for the conversion
+//
+// Returns:
+//   - string: An OpenAI-compatible JSON response containing all message content and metadata
+func ConvertOpenAIResponseToOpenAINonStream(ctx context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) string {
+	log.Debug("ConvertOpenAIResponseToOpenAINonStream")
+	return string(rawJSON)
+}

internal/translator/openai/openai/responses/init.go

@@ -1,9 +1,9 @@
 package responses
 
 import (
-	. "github.com/luispater/CLIProxyAPI/v5/internal/constant"
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	"github.com/luispater/CLIProxyAPI/v5/internal/translator/translator"
+	. "github.com/router-for-me/CLIProxyAPI/v6/internal/constant"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/translator/translator"
 )
 
 func init() {

internal/translator/openai/openai/responses/openai_openai-responses_request.go

@@ -3,6 +3,7 @@ package responses
 import (
 	"bytes"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -27,6 +28,7 @@ import (
 // Returns:
 //   - []byte: The transformed request data in OpenAI chat completions format
 func ConvertOpenAIResponsesRequestToOpenAIChatCompletions(modelName string, inputRawJSON []byte, stream bool) []byte {
+	log.Debug("ConvertOpenAIResponsesRequestToOpenAIChatCompletions")
 	rawJSON := bytes.Clone(inputRawJSON)
 	// Base OpenAI chat completions template with default values
 	out := `{"model":"","messages":[],"stream":false}`

internal/translator/openai/openai/responses/openai_openai-responses_response.go

@@ -1,11 +1,13 @@
 package responses
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"strings"
 	"time"
 
+	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
 )
@@ -34,12 +36,13 @@ type oaiToResponsesState struct {
 }
 
 func emitRespEvent(event string, payload string) string {
-	return fmt.Sprintf("event: %s\ndata: %s\n\n", event, payload)
+	return fmt.Sprintf("event: %s\ndata: %s", event, payload)
 }
 
 // ConvertOpenAIChatCompletionsResponseToOpenAIResponses converts OpenAI Chat Completions streaming chunks
 // to OpenAI Responses SSE events (response.*).
 func ConvertOpenAIChatCompletionsResponseToOpenAIResponses(ctx context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
+	log.Debug("ConvertOpenAIChatCompletionsResponseToOpenAIResponses")
 	if *param == nil {
 		*param = &oaiToResponsesState{
 			FuncArgsBuf:     make(map[int]*strings.Builder),
@@ -55,6 +58,10 @@ func ConvertOpenAIChatCompletionsResponseToOpenAIResponses(ctx context.Context,
 	}
 	st := (*param).(*oaiToResponsesState)
 
+	if bytes.HasPrefix(rawJSON, []byte("data:")) {
+		rawJSON = bytes.TrimSpace(rawJSON[5:])
+	}
+
 	root := gjson.ParseBytes(rawJSON)
 	obj := root.Get("object").String()
 	if obj != "chat.completion.chunk" {
@@ -511,6 +518,7 @@ func ConvertOpenAIChatCompletionsResponseToOpenAIResponses(ctx context.Context,
 // ConvertOpenAIChatCompletionsResponseToOpenAIResponsesNonStream builds a single Responses JSON
 // from a non-streaming OpenAI Chat Completions response.
 func ConvertOpenAIChatCompletionsResponseToOpenAIResponsesNonStream(_ context.Context, _ string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, _ *any) string {
+	log.Debug("ConvertOpenAIChatCompletionsResponseToOpenAIResponsesNonStream")
 	root := gjson.ParseBytes(rawJSON)
 
 	// Basic response scaffold
@@ -540,7 +548,7 @@ func ConvertOpenAIChatCompletionsResponseToOpenAIResponsesNonStream(_ context.Co
 			resp, _ = sjson.Set(resp, "max_output_tokens", v.Int())
 		} else {
 			// Also support max_tokens from chat completion style
-			if v := req.Get("max_tokens"); v.Exists() {
+			if v = req.Get("max_tokens"); v.Exists() {
 				resp, _ = sjson.Set(resp, "max_output_tokens", v.Int())
 			}
 		}
@@ -549,7 +557,7 @@ func ConvertOpenAIChatCompletionsResponseToOpenAIResponsesNonStream(_ context.Co
 		}
 		if v := req.Get("model"); v.Exists() {
 			resp, _ = sjson.Set(resp, "model", v.String())
-		} else if v := root.Get("model"); v.Exists() {
+		} else if v = root.Get("model"); v.Exists() {
 			resp, _ = sjson.Set(resp, "model", v.String())
 		}
 		if v := req.Get("parallel_tool_calls"); v.Exists() {

internal/translator/translator/translator.go

@@ -3,55 +3,28 @@ package translator
 import (
 	"context"
 
-	"github.com/luispater/CLIProxyAPI/v5/internal/interfaces"
-	log "github.com/sirupsen/logrus"
+	"github.com/router-for-me/CLIProxyAPI/v6/internal/interfaces"
+	sdktranslator "github.com/router-for-me/CLIProxyAPI/v6/sdk/translator"
 )
 
-var (
-	Requests  map[string]map[string]interfaces.TranslateRequestFunc
-	Responses map[string]map[string]interfaces.TranslateResponse
-)
-
-func init() {
-	Requests = make(map[string]map[string]interfaces.TranslateRequestFunc)
-	Responses = make(map[string]map[string]interfaces.TranslateResponse)
-}
+var registry = sdktranslator.Default()
 
 func Register(from, to string, request interfaces.TranslateRequestFunc, response interfaces.TranslateResponse) {
-	log.Debugf("Registering translator from %s to %s", from, to)
-	if _, ok := Requests[from]; !ok {
-		Requests[from] = make(map[string]interfaces.TranslateRequestFunc)
-	}
-	Requests[from][to] = request
-
-	if _, ok := Responses[from]; !ok {
-		Responses[from] = make(map[string]interfaces.TranslateResponse)
-	}
-	Responses[from][to] = response
+	registry.Register(sdktranslator.FromString(from), sdktranslator.FromString(to), request, response)
 }
 
 func Request(from, to, modelName string, rawJSON []byte, stream bool) []byte {
-	if translator, ok := Requests[from][to]; ok {
-		return translator(modelName, rawJSON, stream)
-	}
-	return rawJSON
+	return registry.TranslateRequest(sdktranslator.FromString(from), sdktranslator.FromString(to), modelName, rawJSON, stream)
 }
 
 func NeedConvert(from, to string) bool {
-	_, ok := Responses[from][to]
-	return ok
+	return registry.HasResponseTransformer(sdktranslator.FromString(from), sdktranslator.FromString(to))
 }
 
 func Response(from, to string, ctx context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) []string {
-	if translator, ok := Responses[from][to]; ok {
-		return translator.Stream(ctx, modelName, originalRequestRawJSON, requestRawJSON, rawJSON, param)
-	}
-	return []string{string(rawJSON)}
+	return registry.TranslateStream(ctx, sdktranslator.FromString(from), sdktranslator.FromString(to), modelName, originalRequestRawJSON, requestRawJSON, rawJSON, param)
 }
 
 func ResponseNonStream(from, to string, ctx context.Context, modelName string, originalRequestRawJSON, requestRawJSON, rawJSON []byte, param *any) string {
-	if translator, ok := Responses[from][to]; ok {
-		return translator.NonStream(ctx, modelName, originalRequestRawJSON, requestRawJSON, rawJSON, param)
-	}
-	return string(rawJSON)
+	return registry.TranslateNonStream(ctx, sdktranslator.FromString(from), sdktranslator.FromString(to), modelName, originalRequestRawJSON, requestRawJSON, rawJSON, param)
 }