Skip to content

fix(anthropic): add billing header for OAuth plan-tier routing (#48176) #48202

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.

Sign up for GitHub

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

Closed
kyssta-exe wants to merge 1 commit into from
Closed

fix(anthropic): add billing header for OAuth plan-tier routing (#48176) #48202

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions agent/anthropic_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2126,16 +2126,29 @@ def build_anthropic_kwargs(

# ── OAuth: Claude Code identity ──────────────────────────────────
if is_oauth:
# 1. Prepend Claude Code system prompt identity
# 1. Prepend billing-attribution token as system[0].
# Anthropic's server-side billing gate routes OAuth requests
# to the subscription plan only when the request carries this
# machine-parsed header block. Without it, Pro/Max/Team
# requests are attributed as third-party and rejected with
# HTTP 400 "extra usage, not plan limits". GH-48176.
billing_block = {
"type": "text",
"text": (
f"x-anthropic-billing-header: cc_version="
f"{_get_claude_code_version()}; cc_entrypoint=sdk-cli;"
),
}
# 2. Prepend Claude Code system prompt identity
cc_block = {"type": "text", "text": _CLAUDE_CODE_SYSTEM_PREFIX}
if isinstance(system, list):
system = [cc_block] + system
system = [billing_block, cc_block] + system
elif isinstance(system, str) and system:
system = [cc_block, {"type": "text", "text": system}]
system = [billing_block, cc_block, {"type": "text", "text": system}]
else:
system = [cc_block]
system = [billing_block, cc_block]

# 2. Sanitize system prompt — replace product name references
# 3. Sanitize system prompt — replace product name references
# to avoid Anthropic's server-side content filters.
for block in system:
if isinstance(block, dict) and block.get("type") == "text":
Expand All @@ -2146,7 +2159,7 @@ def build_anthropic_kwargs(
text = text.replace("Nous Research", "Anthropic")
block["text"] = text

# 3. Prefix tool names with mcp_ (Claude Code convention)
# 4. Prefix tool names with mcp_ (Claude Code convention)
# Skip names that already begin with the marker — native MCP server
# tools (from mcp_servers: in config.yaml) are registered under their
# full mcp_<server>_<tool> name and would double-prefix otherwise,
Expand All @@ -2156,7 +2169,7 @@ def build_anthropic_kwargs(
if "name" in tool and not tool["name"].startswith(_MCP_TOOL_PREFIX):
tool["name"] = _MCP_TOOL_PREFIX + tool["name"]

# 4. Prefix tool names in message history (tool_use and tool_result blocks)
# 5. Prefix tool names in message history (tool_use and tool_result blocks)
for msg in anthropic_messages:
content = msg.get("content")
if isinstance(content, list):
Expand Down