MPS: launch on a servable default model, and honor --model under --provider - #380
Open
masonc08 wants to merge 11 commits into
Open
MPS: launch on a servable default model, and honor --model under --provider#380masonc08 wants to merge 11 commits into
masonc08 wants to merge 11 commits into
Conversation
`ucode claude --provider <mps>` sends whatever model string Claude Code's alias resolves to, and the gateway's direct-MPS path exact-matches that against the service's declared targets (then forwards it verbatim). For a Bedrock service ucode already pins ANTHROPIC_DEFAULT_*_MODEL to the service's target slugs, but for an API-key Anthropic service it pinned nothing and trusted Claude Code's canonical names to match — which they may not: a custom/dated target name, or an enterprise managed-settings pin like `system.ai.claude-haiku-4-5`, yields a 403 "not in the allowed models list". resolve_provider_models now derives the family->target map for a non-relayed Anthropic service too (map_claude_family_models already handles canonical ids), so the client sends exactly the ids the MPS declares. Bedrock is unchanged; relayed Claude Max/Enterprise stays exempt (model selection is off server-side). Co-authored-by: Isaac <no-reply@databricks.com>
…--model pick one `ucode claude --provider <mps>` always started on Claude Code's built-in "family default" (opus). When the Model Provider Service declares no opus target the gateway 403s that default, so a bare launch failed for any service that only offers sonnet/haiku. `--model` couldn't rescue it either: `--model` + `--provider` was rejected outright. Now, under a provider: - with no --model, pick the most capable tier the service actually declares (opus > sonnet > haiku) and pin it via ANTHROPIC_MODEL, so the session starts on a servable model instead of dead-ending on opus. When the service does offer opus, pin nothing -- Claude Code's own default already works, and this avoids the duplicate /model picker row ANTHROPIC_MODEL causes. - --model is honored (guard removed): a family alias (opus/sonnet/haiku) resolves to that tier's declared target (clear error if the service doesn't offer it), any other value is trusted as a raw target id. Routed via route_root_model, not custom_model, so it doesn't clobber the per-family pins. - a relayed (subscription) service selects the model server-side, so --model is ignored with a warning. Known gap, deferred: for an opus-less Bedrock service the region-prefixed slug can be rejected by ANTHROPIC_MODEL's client-side check. That case was already broken (bare launch 403s), and opus-having Bedrock services are unaffected; the follow-up is to pin the servable target into the opus family slot instead. Co-authored-by: Isaac <no-reply@databricks.com>
masonc08
force-pushed
the
masonc08/mps-default-launch-model
branch
from
August 25, 2026 01:32
d4ff231 to
f98b473
Compare
…efault-launch-model
The docstring and PR description already carry this rationale; the inline block was a third copy of it. Co-authored-by: Isaac <no-reply@databricks.com>
…efault-launch-model Co-authored-by: Isaac <no-reply@databricks.com>
…efault-launch-model
lilly-luo
reviewed
Aug 29, 2026
Comment on lines
+1878
to
+1889
| # Claude Code starts on its built-in "family default" (opus), which the gateway 403s when | ||
| # the service declares no opus target. Pick the launch model explicitly and pin it via | ||
| # ANTHROPIC_MODEL (route_root_model): the user's --model when given, else the most capable | ||
| # tier the service actually offers. A relayed service selects the model server-side, so | ||
| # there's nothing to pin — and --model can't be honored, so say so rather than ignore it. | ||
| # | ||
| # KNOWN GAP (deferred): ANTHROPIC_MODEL is checked client-side, so this covers services | ||
| # whose targets are canonical Anthropic names (an API-key Anthropic service); a Bedrock | ||
| # service's region-prefixed slug can be rejected there. Only an opus-less Bedrock service | ||
| # hits this — an opus-having one returns None above and is unaffected — and that case was | ||
| # already broken (bare launch 403s on opus). The follow-up fix is to pin the servable | ||
| # target into the opus family slot instead (that channel is passed through unchecked). |
lilly-luo
approved these changes
Aug 29, 2026
lilly-luo
reviewed
Aug 29, 2026
| # Claude Code starts every session on its opus tier, which the gateway 403s when a Model Provider | ||
| # Service declares no opus target. When opus is missing, fall back to the most capable tier the | ||
| # service does offer. opus > sonnet > haiku. | ||
| _CLAUDE_LAUNCH_TIER_PREFERENCE = ("opus", "sonnet", "haiku") |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
ucode claude --provider <mps>always started on Claude Code's built-in "family default" (opus). When a Model Provider Service declares no opus target, the gateway 403s that default — so a bare launch failed for any service that only offers sonnet/haiku (e.g. an API-key Anthropic MPS scoped to sonnet+haiku).--modelcouldn't rescue it either:--model+--providerwas rejected outright with "Use either --model or --provider, not both."Stacked on #376 (which pins the declared per-family targets); this makes the launch model land on one of them.
Change
Under a provider:
--model, choose the most capable tier the service actually declares (opus > sonnet > haiku) and pin it viaANTHROPIC_MODEL, so the session starts on a servable model instead of dead-ending on opus. When the service does offer opus, pin nothing — Claude Code's own default already works, and this avoids the duplicate/modelpicker rowANTHROPIC_MODELproduces.--model(guard removed). A family alias (opus/sonnet/haiku) resolves to that tier's declared target (clear error if the service doesn't offer it); any other value is trusted as a raw target id. Routed viaroute_root_model, notcustom_model, so it doesn't clobber the per-family pins from Pin declared Anthropic MPS targets by family, like Bedrock #376.--modelis ignored with a warning.The launch banner now also prints the chosen
Model:under a provider.Known gap (deferred)
For an opus-less Bedrock service the region-prefixed slug can be rejected by
ANTHROPIC_MODEL's client-side check. That case was already broken (bare launch 403s on opus), and opus-having Bedrock services are unaffected (they returnNoneand behave as today). The follow-up fix is to pin the servable target into the opus family slot instead — that channel is passed through unchecked.Testing
resolve_provider_launch_model(7 cases: opus-present no-op, sonnet/haiku fallback, alias→target, unavailable-tier error, raw-id passthrough); CLI provider-launch (alias pin, auto-default, opus-present no-op, unavailable-tier error, relayed-ignored).test_databricks.py(248),test_cli.py(218),test_agent_claude.py+test_agents_init.py(188).ruffclean.--model haikustarts on haiku;--model opuserrors clearly.This pull request and its description were written by Isaac.