Skip to content

claude: enable Claude Code native gateway model discovery #347

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

Open
andy-xu-db wants to merge 1 commit into
base: main
Choose a base branch
from
Open

claude: enable Claude Code native gateway model discovery #347

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions src/ucode/agents/claude.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,11 @@ def render_overlay(
"ENABLE_TOOL_SEARCH": "1",
"CLAUDE_CODE_USE_GATEWAY": "1",
}
# Native /model discovery: picker lists every gateway Messages-API endpoint,
# not just the family aliases. Skipped under a provider (its routing header
# would send a discovered gateway id to a provider that can't resolve it).
if not provider:
env["CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY"] = "1"
# Intentionally NOT setting ANTHROPIC_MODEL by default. Setting it produces a
# duplicate catalog row in Claude Code's /model picker (e.g. "Opus 4.8 (1M
# context) ✓") on top of the family-alias row from ANTHROPIC_DEFAULT_OPUS_MODEL.
Expand Down
11 changes: 11 additions & 0 deletions tests/test_agent_claude.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,17 @@ def test_enables_use_gateway(self):
overlay, _ = claude.render_overlay(WS, "s4")
assert overlay["env"]["CLAUDE_CODE_USE_GATEWAY"] == "1"

def test_enables_gateway_model_discovery(self):
overlay, _ = claude.render_overlay(WS, "s4")
assert overlay["env"]["CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY"] == "1"

def test_gateway_model_discovery_skipped_under_provider(self):
# A Model Provider Service routes every request to the external provider,
# so a discovered gateway endpoint id would reach a provider that can't
# resolve it — discovery must be off in that mode.
overlay, _ = claude.render_overlay(WS, "s4", provider="main.x.claude-svc")
assert "CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY" not in overlay["env"]

def test_sets_api_key_helper(self):
overlay, _ = claude.render_overlay(WS, "s4")
assert "apiKeyHelper" in overlay
Expand Down
Loading