fix(网关): 完善 Claude OAuth/Claude Code 兼容 #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

cyhhao wants to merge 23 commits into Wei-Shaw:main from cyhhao:fix/claude-oauth-compat

backend/internal/handler/gateway_handler.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -707,6 +707,9 @@ func (h *GatewayHandler) CountTokens(c *gin.Context) { @@
     		return
     	}
+    	// 检查是否为 Claude Code 客户端，设置到 context 中
+    	SetClaudeCodeClientContext(c, body)
     	setOpsRequestContext(c, "", false, body)
     	parsedReq, err := service.ParseGatewayRequest(body)
@@ Expand Down @@

backend/internal/pkg/claude/constants.go

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -9,11 +9,21 @@ const (
  
    	BetaClaudeCode               = "claude-code-20250219"

    	BetaInterleavedThinking      = "interleaved-thinking-2025-05-14"

    	BetaFineGrainedToolStreaming = "fine-grained-tool-streaming-2025-05-14"

    	BetaTokenCounting            = "token-counting-2024-11-01"

    )

    // DefaultBetaHeader Claude Code 客户端默认的 anthropic-beta header

    const DefaultBetaHeader = BetaClaudeCode + "," + BetaOAuth + "," + BetaInterleavedThinking + "," + BetaFineGrainedToolStreaming

    // MessageBetaHeaderNoTools /v1/messages 在无工具时的 beta header

    const MessageBetaHeaderNoTools = BetaOAuth + "," + BetaInterleavedThinking

    // MessageBetaHeaderWithTools /v1/messages 在有工具时的 beta header

    const MessageBetaHeaderWithTools = BetaClaudeCode + "," + BetaOAuth + "," + BetaInterleavedThinking

    // CountTokensBetaHeader count_tokens 请求使用的 anthropic-beta header

    const CountTokensBetaHeader = BetaClaudeCode + "," + BetaOAuth + "," + BetaInterleavedThinking + "," + BetaTokenCounting

    // HaikuBetaHeader Haiku 模型使用的 anthropic-beta header（不需要 claude-code beta）

    const HaikuBetaHeader = BetaOAuth + "," + BetaInterleavedThinking

    @@ -25,15 +35,15 @@ const APIKeyHaikuBetaHeader = BetaInterleavedThinking
  
    // DefaultHeaders 是 Claude Code 客户端默认请求头。

    var DefaultHeaders = map[string]string{

    	"User-Agent":                                "claude-cli/2.0.62 (external, cli)",

    	"User-Agent":                                "claude-cli/2.1.2 (external, cli)",

    	"X-Stainless-Lang":                          "js",

    	"X-Stainless-Package-Version":               "0.52.0",

    	"X-Stainless-Package-Version":               "0.70.0",

    	"X-Stainless-OS":                            "Linux",

    	"X-Stainless-Arch":                          "x64",

    	"X-Stainless-Runtime":                       "node",

    	"X-Stainless-Runtime-Version":               "v22.14.0",

    	"X-Stainless-Runtime-Version":               "v24.3.0",

    	"X-Stainless-Retry-Count":                   "0",

    	"X-Stainless-Timeout":                       "60",

    	"X-Stainless-Timeout":                       "600",

    	"X-App":                                     "cli",

    	"Anthropic-Dangerous-Direct-Browser-Access": "true",

    }

    @@ -79,3 +89,39 @@ func DefaultModelIDs() []string {
  
    // DefaultTestModel 测试时使用的默认模型

    const DefaultTestModel = "claude-sonnet-4-5-20250929"

    // ModelIDOverrides Claude OAuth 请求需要的模型 ID 映射

    var ModelIDOverrides = map[string]string{

    	"claude-sonnet-4-5": "claude-sonnet-4-5-20250929",

    	"claude-opus-4-5":   "claude-opus-4-5-20251101",

    	"claude-haiku-4-5":  "claude-haiku-4-5-20251001",

    }

    // ModelIDReverseOverrides 用于将上游模型 ID 还原为短名

    var ModelIDReverseOverrides = map[string]string{

    	"claude-sonnet-4-5-20250929": "claude-sonnet-4-5",

    	"claude-opus-4-5-20251101":   "claude-opus-4-5",

    	"claude-haiku-4-5-20251001":  "claude-haiku-4-5",

    }

    // NormalizeModelID 根据 Claude OAuth 规则映射模型

    func NormalizeModelID(id string) string {

    	if id == "" {

    		return id

    	}

    	if mapped, ok := ModelIDOverrides[id]; ok {

    		return mapped

    	}

    	return id

    }

    // DenormalizeModelID 将上游模型 ID 转换为短名

    func DenormalizeModelID(id string) string {

    	if id == "" {

    		return id

    	}

    	if mapped, ok := ModelIDReverseOverrides[id]; ok {

    		return mapped

    	}

    	return id

    }

backend/internal/service/account.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -381,6 +381,22 @@ func (a *Account) GetExtraString(key string) string { @@
     	return ""
     }
+    func (a *Account) GetClaudeUserID() string {
+    	if v := strings.TrimSpace(a.GetExtraString("claude_user_id")); v != "" {
+    		return v
+    	}
+    	if v := strings.TrimSpace(a.GetExtraString("anthropic_user_id")); v != "" {
+    		return v
+    	}
+    	if v := strings.TrimSpace(a.GetCredential("claude_user_id")); v != "" {
+    		return v
+    	}
+    	if v := strings.TrimSpace(a.GetCredential("anthropic_user_id")); v != "" {
+    		return v
+    	}
+    	return ""
+    }
     func (a *Account) IsCustomErrorCodesEnabled() bool {
     	if a.Type != AccountTypeAPIKey || a.Credentials == nil {
     		return false
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(网关): 完善 Claude OAuth/Claude Code 兼容 #316

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

fix(网关): 完善 Claude OAuth/Claude Code 兼容 #316

Are you sure you want to change the base?

Uh oh!

fix(网关): 完善 Claude OAuth/Claude Code 兼容 #316

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!