- Store must be set to false (#252)

hging · web-flow · commit fd93783f4314 · 2026-02-25T14:15:58.000+08:00
- 处理：Codex 请求强制输出 store:false，并在 Claude→Codex 转换中显式设置。
      - 相关：internal/converter/types_codex.go, internal/converter/
        claude_to_codex.go
  - Unsupported parameter: max_output_tokens
      - 处理：上游前把 max_output_tokens 改写为 max_tokens 并移除旧字段。
      - 相关：internal/adapter/provider/codex/adapter.go, internal/adapter/provider/
        codex/adapter_test.go
  - Unknown parameter: input[i].role
      - 处理：非 message 类型的 input 项去掉 role，保留 message 的 role；同时去掉
        Claude→Codex 中 function_call 的 role。
      - 相关：internal/adapter/provider/codex/adapter.go, internal/adapter/provider/
        cliproxyapi_codex/adapter.go, internal/converter/claude_to_codex.go
  - Invalid input[i].id ... Expected an ID that begins with 'fc'
      - 处理：function_call 的 id 统一前缀 fc_；并在清洗阶段兜底修正。
      - 相关：internal/converter/claude_to_codex.go, internal/adapter/provider/codex/
        adapter.go, internal/adapter/provider/cliproxyapi_codex/adapter.go
  - Missing required parameter: input[i].output
      - 处理：tool_result 内容统一转成字符串；若缺 output 字段则补空字符串。
      - 相关：internal/converter/claude_to_codex.go, internal/adapter/provider/codex/
        adapter.go, internal/adapter/provider/cliproxyapi_codex/adapter.go
diff --git a/internal/adapter/provider/cliproxyapi_codex/adapter.go b/internal/adapter/provider/cliproxyapi_codex/adapter.go
@@ -21,6 +21,8 @@ import (
 	"github.com/router-for-me/CLIProxyAPI/v6/sdk/cliproxy/executor"
 	"github.com/router-for-me/CLIProxyAPI/v6/sdk/exec"
 	"github.com/router-for-me/CLIProxyAPI/v6/sdk/translator"
+	"github.com/tidwall/gjson"
+	"github.com/tidwall/sjson"
 )
 
 // TokenCache caches access tokens
@@ -227,6 +229,11 @@ func (a *CLIProxyAPICodexAdapter) Execute(c *flow.Ctx, p *domain.Provider) error
 		return domain.NewProxyErrorWithMessage(err, true, fmt.Sprintf("failed to get access token: %v", err))
 	}
 
+	// Normalize Codex payload for upstream compatibility.
+	if len(requestBody) > 0 {
+		requestBody = sanitizeCodexPayload(requestBody)
+	}
+
 	// 构建 executor 请求
 	execReq := executor.Request{
 		Model:   model,
@@ -246,6 +253,30 @@ func (a *CLIProxyAPICodexAdapter) Execute(c *flow.Ctx, p *domain.Provider) error
 	return a.executeNonStream(c, w, execReq, execOpts)
 }
 
+func sanitizeCodexPayload(body []byte) []byte {
+	if input := gjson.GetBytes(body, "input"); input.IsArray() {
+		for i, item := range input.Array() {
+			itemType := item.Get("type").String()
+			if itemType != "message" {
+				if item.Get("role").Exists() {
+					body, _ = sjson.DeleteBytes(body, fmt.Sprintf("input.%d.role", i))
+				}
+			}
+			if itemType == "function_call" {
+				if id := item.Get("id").String(); id != "" && !strings.HasPrefix(id, "fc_") {
+					body, _ = sjson.SetBytes(body, fmt.Sprintf("input.%d.id", i), "fc_"+id)
+				}
+			}
+			if itemType == "function_call_output" {
+				if !item.Get("output").Exists() {
+					body, _ = sjson.SetBytes(body, fmt.Sprintf("input.%d.output", i), "")
+				}
+			}
+		}
+	}
+	return body
+}
+
 func (a *CLIProxyAPICodexAdapter) executeNonStream(c *flow.Ctx, w http.ResponseWriter, execReq executor.Request, execOpts executor.Options) error {
 	ctx := context.Background()
 	if c.Request != nil {
diff --git a/internal/adapter/provider/codex/adapter.go b/internal/adapter/provider/codex/adapter.go
@@ -561,9 +561,37 @@ func applyCodexRequestTuning(c *flow.Ctx, body []byte) (string, []byte) {
 	body, _ = sjson.DeleteBytes(body, "previous_response_id")
 	body, _ = sjson.DeleteBytes(body, "prompt_cache_retention")
 	body, _ = sjson.DeleteBytes(body, "safety_identifier")
+	if maxOut := gjson.GetBytes(body, "max_output_tokens"); maxOut.Exists() {
+		if !gjson.GetBytes(body, "max_tokens").Exists() {
+			if updated, err := sjson.SetBytes(body, "max_tokens", maxOut.Value()); err == nil {
+				body = updated
+			}
+		}
+		body, _ = sjson.DeleteBytes(body, "max_output_tokens")
+	}
 	if !gjson.GetBytes(body, "instructions").Exists() {
 		body, _ = sjson.SetBytes(body, "instructions", "")
 	}
+	if input := gjson.GetBytes(body, "input"); input.IsArray() {
+		for i, item := range input.Array() {
+			itemType := item.Get("type").String()
+			if itemType != "message" {
+				if item.Get("role").Exists() {
+					body, _ = sjson.DeleteBytes(body, fmt.Sprintf("input.%d.role", i))
+				}
+			}
+			if itemType == "function_call" {
+				if id := item.Get("id").String(); id != "" && !strings.HasPrefix(id, "fc_") {
+					body, _ = sjson.SetBytes(body, fmt.Sprintf("input.%d.id", i), "fc_"+id)
+				}
+			}
+			if itemType == "function_call_output" {
+				if !item.Get("output").Exists() {
+					body, _ = sjson.SetBytes(body, fmt.Sprintf("input.%d.output", i), "")
+				}
+			}
+		}
+	}
 
 	return cacheID, body
 }
diff --git a/internal/adapter/provider/codex/adapter_test.go b/internal/adapter/provider/codex/adapter_test.go
@@ -14,7 +14,7 @@ func TestApplyCodexRequestTuning(t *testing.T) {
 	c.Set(flow.KeyOriginalClientType, domain.ClientTypeClaude)
 	c.Set(flow.KeyOriginalRequestBody, []byte(`{"metadata":{"user_id":"user-123"}}`))
 
-	body := []byte(`{"model":"gpt-5","stream":false,"instructions":"x","previous_response_id":"r1","prompt_cache_retention":123,"safety_identifier":"s1"}`)
+	body := []byte(`{"model":"gpt-5","stream":false,"instructions":"x","previous_response_id":"r1","prompt_cache_retention":123,"safety_identifier":"s1","max_output_tokens":77,"input":[{"type":"message","role":"user","content":"hi"},{"type":"function_call","role":"assistant","name":"t","arguments":"{}"},{"role":"tool","call_id":"c1","output":"ok"}]}`)
 	cacheID, tuned := applyCodexRequestTuning(c, body)
 
 	if cacheID == "" {
@@ -35,6 +35,18 @@ func TestApplyCodexRequestTuning(t *testing.T) {
 	if gjson.GetBytes(tuned, "safety_identifier").Exists() {
 		t.Fatalf("expected safety_identifier to be removed")
 	}
+	if gjson.GetBytes(tuned, "max_output_tokens").Exists() {
+		t.Fatalf("expected max_output_tokens to be removed")
+	}
+	if gjson.GetBytes(tuned, "max_tokens").Int() != 77 {
+		t.Fatalf("expected max_tokens to be set from max_output_tokens")
+	}
+	if gjson.GetBytes(tuned, "input.0.role").String() != "user" {
+		t.Fatalf("expected role to be preserved for message input")
+	}
+	if gjson.GetBytes(tuned, "input.1.role").Exists() || gjson.GetBytes(tuned, "input.2.role").Exists() {
+		t.Fatalf("expected role to be removed for non-message inputs")
+	}
 }
 
 func TestApplyCodexHeadersFiltersSensitiveAndPreservesUA(t *testing.T) {
diff --git a/internal/converter/claude_to_codex.go b/internal/converter/claude_to_codex.go
@@ -28,6 +28,7 @@ func (c *claudeToCodexRequest) Transform(body []byte, model string, stream bool)
 		MaxOutputTokens: req.MaxTokens,
 		Temperature:     req.Temperature,
 		TopP:            req.TopP,
+		Store:           false,
 	}
 
 	shortMap := map[string]string{}
@@ -90,26 +91,34 @@ func (c *claudeToCodexRequest) Transform(body []byte, model string, stream bool)
 						} else {
 							name = shortenNameIfNeeded(name)
 						}
-						id, _ := m["id"].(string)
-						inputData := m["input"]
-						argJSON, _ := json.Marshal(inputData)
-						input = append(input, CodexInputItem{
-							Type:      "function_call",
-							ID:        id,
-							CallID:    id,
-							Name:      name,
-							Role:      "assistant",
-							Arguments: string(argJSON),
-						})
+							id, _ := m["id"].(string)
+							callID := id
+							callItemID := ""
+							if callID != "" {
+								if strings.HasPrefix(callID, "fc_") {
+									callItemID = callID
+								} else {
+									callItemID = "fc_" + callID
+								}
+							}
+							inputData := m["input"]
+							argJSON, _ := json.Marshal(inputData)
+							input = append(input, CodexInputItem{
+								Type:      "function_call",
+								ID:        callItemID,
+								CallID:    callID,
+								Name:      name,
+								Arguments: string(argJSON),
+							})
 						continue
-					case "tool_result":
-						toolUseID, _ := m["tool_use_id"].(string)
-						resultContent, _ := m["content"].(string)
-						input = append(input, CodexInputItem{
-							Type:   "function_call_output",
-							CallID: toolUseID,
-							Output: resultContent,
-						})
+						case "tool_result":
+							toolUseID, _ := m["tool_use_id"].(string)
+							resultContent := convertClaudeToolResultContentToString(m["content"])
+							input = append(input, CodexInputItem{
+								Type:   "function_call_output",
+								CallID: toolUseID,
+								Output: resultContent,
+							})
 						continue
 					}
 				}
@@ -192,10 +201,18 @@ func (c *claudeToCodexResponse) Transform(body []byte) ([]byte, error) {
 			})
 		case "tool_use":
 			argJSON, _ := json.Marshal(block.Input)
+			callID := block.ID
+			itemID := block.ID
+			if callID != "" {
+				if strings.HasPrefix(callID, "fc_") {
+					callID = strings.TrimPrefix(callID, "fc_")
+				}
+				itemID = "fc_" + callID
+			}
 			codexResp.Output = append(codexResp.Output, CodexOutput{
 				Type:      "function_call",
-				ID:        block.ID,
-				CallID:    block.ID,
+				ID:        itemID,
+				CallID:    callID,
 				Name:      block.Name,
 				Arguments: string(argJSON),
 				Status:    "completed",
