fix(cli): map sonnet alias to Claude Sonnet 5.5 (EveryInc#1796)

Author: tmchow

docs/solutions/integrations/cross-platform-model-field-normalization.md

@@ -29,7 +29,7 @@ Claude Code uses bare model aliases (`model: sonnet`) in agent and command front
 
 | Target | Behavior | Why |
 |--------|----------|-----|
-| OpenCode | Resolve alias + add provider prefix (`anthropic/claude-sonnet-5`) | Multi-provider; routes on the `provider/model-id` prefix. Same rule for any future multi-provider target with that format (the removed Qwen and OpenClaw converters used it). |
+| OpenCode | Resolve alias + add provider prefix (`anthropic/claude-sonnet-5-5`) | Multi-provider; routes on the `provider/model-id` prefix. Same rule for any future multi-provider target with that format (the removed Qwen and OpenClaw converters used it). |
 | Droid (Factory) | Pass through as-is (`sonnet`) | Factory resolves Claude's bare aliases natively and also accepts dated IDs and `custom:<model>`; normalizing to a form it also accepts adds nothing. |
 | Copilot | Drop | Copilot's `model` field takes Copilot display names ("Claude Opus 4.5"), not Claude model IDs or aliases, and has no documented resolution for them. Spec: "If unset, inherits the default model." |
 | Codex | Drop | Skill frontmatter supports only `name` and `description` (Rust `SkillFrontmatter` struct). Model selection is global via `config.toml` or `/model`. |

src/converters/claude-to-opencode.ts

@@ -142,7 +142,7 @@ function convertAgent(agent: ClaudeAgent, options: ClaudeToOpenCodeOptions) {
 
   if (options.inferTemperature) {
     const temperature = inferTemperature(agent)
-    // A written model that rejects non-default sampling params (Sonnet 5, Opus
+    // A written model that rejects non-default sampling params (Sonnet 5+, Opus
     // 4.7+) returns HTTP 400 if paired with a temperature. We only write model
     // for primary agents, so suppression only applies there; subagents inherit
     // the parent session's model and are out of scope.

src/utils/model.ts

@@ -12,7 +12,7 @@
  */
 export const CLAUDE_FAMILY_ALIASES: Record<string, string> = {
   haiku: "claude-haiku-4-5",
-  sonnet: "claude-sonnet-5",
+  sonnet: "claude-sonnet-5-5",
   opus: "claude-opus-5-5",
 }
 
@@ -21,10 +21,11 @@ export const CLAUDE_FAMILY_ALIASES: Record<string, string> = {
  * (`temperature`/`top_p`/`top_k`) with HTTP 400. Emitting an inferred
  * temperature alongside one of these produces a config that fails at runtime.
  * Keep in sync with CLAUDE_FAMILY_ALIASES when new generations are released.
- * See the Sonnet 5, Opus 4.7/4.8, and Opus 5.5 migration notes.
+ * See the Sonnet 5/5.5, Opus 4.7/4.8, and Opus 5.5 migration notes.
  */
 const SAMPLING_PARAM_REJECTING_MODELS: ReadonlySet<string> = new Set([
   "claude-sonnet-5",
+  "claude-sonnet-5-5",
   "claude-opus-4-7",
   "claude-opus-4-8",
   "claude-opus-5",
@@ -35,7 +36,7 @@ const SAMPLING_PARAM_REJECTING_MODELS: ReadonlySet<string> = new Set([
  * Resolve a bare Claude family alias to its canonical model name.
  * Returns the input unchanged if not a recognized alias.
  *
- * "sonnet" -> "claude-sonnet-5"
+ * "sonnet" -> "claude-sonnet-5-5"
  * "claude-sonnet-4-20250514" -> "claude-sonnet-4-20250514" (unchanged)
  */
 export function resolveClaudeFamilyAlias(model: string): string {
@@ -46,7 +47,7 @@ export function resolveClaudeFamilyAlias(model: string): string {
  * Add a provider prefix based on model naming conventions.
  * Returns the input unchanged if already prefixed (contains "/").
  *
- * "claude-sonnet-5" -> "anthropic/claude-sonnet-5"
+ * "claude-sonnet-5-5" -> "anthropic/claude-sonnet-5-5"
  * "gpt-6-sol"       -> "openai/gpt-6-sol"
  * "gemini-2.0"        -> "google/gemini-2.0"
  * "minimax-m3"        -> "minimax/minimax-m3"
@@ -66,7 +67,7 @@ export function addProviderPrefix(model: string): string {
  * Normalize a model for targets that use provider-prefixed IDs.
  * Resolves bare aliases and adds provider prefix.
  *
- * "sonnet"                  -> "anthropic/claude-sonnet-5"
+ * "sonnet"                  -> "anthropic/claude-sonnet-5-5"
  * "claude-sonnet-4-20250514" -> "anthropic/claude-sonnet-4-20250514"
  * "anthropic/claude-opus"    -> "anthropic/claude-opus" (unchanged)
  */
@@ -85,9 +86,9 @@ export function normalizeModelWithProvider(model: string): string {
 /**
  * Whether a model rejects non-default sampling params. Accepts a bare alias,
  * a canonical ID, or a provider-prefixed ID; resolves aliases and strips the
- * provider prefix so `sonnet` and `anthropic/claude-sonnet-5` both match.
+ * provider prefix so `sonnet` and `anthropic/claude-sonnet-5-5` both match.
  *
- * "sonnet"                     -> true  (resolves to claude-sonnet-5)
+ * "sonnet"                     -> true  (resolves to claude-sonnet-5-5)
  * "claude-sonnet-4-20250514"   -> false (dated Sonnet 4 accepts sampling params)
  */
 export function rejectsSamplingParams(model: string): boolean {

tests/converter.test.ts

@@ -278,10 +278,10 @@ describe("convertClaudeToOpenCode", () => {
       permissions: "none",
     })
 
-    // Sonnet 5 rejects non-default temperature with HTTP 400, so the converter
+    // Sonnet 5.5 rejects non-default temperature with HTTP 400, so the converter
     // must write the model but omit the inferred temperature.
     const sonnetAgent = parseFrontmatter(bundle.agents.find((a) => a.name === "security-guardian")!.content)
-    expect(sonnetAgent.data.model).toBe("anthropic/claude-sonnet-5")
+    expect(sonnetAgent.data.model).toBe("anthropic/claude-sonnet-5-5")
     expect(sonnetAgent.data.temperature).toBeUndefined()
 
     // Haiku still accepts sampling params, so temperature is inferred as usual.

tests/model-utils.test.ts

@@ -10,7 +10,7 @@ import {
 describe("resolveClaudeFamilyAlias", () => {
   test("resolves bare aliases to full Claude model names", () => {
     expect(resolveClaudeFamilyAlias("haiku")).toBe("claude-haiku-4-5")
-    expect(resolveClaudeFamilyAlias("sonnet")).toBe("claude-sonnet-5")
+    expect(resolveClaudeFamilyAlias("sonnet")).toBe("claude-sonnet-5-5")
     expect(resolveClaudeFamilyAlias("opus")).toBe("claude-opus-5-5")
   })
 
@@ -23,7 +23,7 @@ describe("resolveClaudeFamilyAlias", () => {
 
 describe("addProviderPrefix", () => {
   test("prefixes Claude models with anthropic/", () => {
-    expect(addProviderPrefix("claude-sonnet-5")).toBe("anthropic/claude-sonnet-5")
+    expect(addProviderPrefix("claude-sonnet-5-5")).toBe("anthropic/claude-sonnet-5-5")
     expect(addProviderPrefix("claude-haiku-4-5")).toBe("anthropic/claude-haiku-4-5")
   })
 
@@ -65,7 +65,7 @@ describe("addProviderPrefix", () => {
 
 describe("normalizeModelWithProvider", () => {
   test("resolves bare aliases and adds provider prefix", () => {
-    expect(normalizeModelWithProvider("sonnet")).toBe("anthropic/claude-sonnet-5")
+    expect(normalizeModelWithProvider("sonnet")).toBe("anthropic/claude-sonnet-5-5")
     expect(normalizeModelWithProvider("haiku")).toBe("anthropic/claude-haiku-4-5")
     expect(normalizeModelWithProvider("opus")).toBe("anthropic/claude-opus-5-5")
   })
@@ -85,11 +85,12 @@ describe("rejectsSamplingParams", () => {
     expect(rejectsSamplingParams("sonnet")).toBe(true)
     expect(rejectsSamplingParams("opus")).toBe(true)
     expect(rejectsSamplingParams("claude-sonnet-5")).toBe(true)
+    expect(rejectsSamplingParams("claude-sonnet-5-5")).toBe(true)
     expect(rejectsSamplingParams("claude-opus-5-5")).toBe(true)
     expect(rejectsSamplingParams("claude-opus-4-8")).toBe(true)
     expect(rejectsSamplingParams("claude-opus-5")).toBe(true)
     expect(rejectsSamplingParams("claude-opus-4-7")).toBe(true)
-    expect(rejectsSamplingParams("anthropic/claude-sonnet-5")).toBe(true)
+    expect(rejectsSamplingParams("anthropic/claude-sonnet-5-5")).toBe(true)
   })
 
   test("passes models that still accept sampling params", () => {