@@ -8,6 +8,7 @@ import type { Mock } from "vitest"
 import {
 	ProviderSettings,
 	ModelInfo,
+	anthropicModels,
 	BEDROCK_1M_CONTEXT_MODEL_IDS,
 	litellmDefaultModelInfo,
 	kenariDefaultModelId,
@@ -440,6 +441,23 @@ describe("useSelectedModel", () => {
 			expect(result.current.info?.inputPrice).toBe(6.0)
 			expect(result.current.info?.outputPrice).toBe(22.5)
 		})
+
+		it.each(["anthropic", "gemini-cli", "fake-ai"] as const)(
+			"should explicitly resolve configured models for %s",
+			(apiProvider) => {
+				const apiConfiguration: ProviderSettings = {
+					apiProvider,
+					apiModelId: "claude-sonnet-4-6",
+				}
+
+				const wrapper = createWrapper()
+				const { result } = renderHook(() => useSelectedModel(apiConfiguration), { wrapper })
+
+				expect(result.current.provider).toBe(apiProvider)
+				expect(result.current.id).toBe("claude-sonnet-4-6")
+				expect(result.current.info).toEqual(anthropicModels["claude-sonnet-4-6"])
+			},
+		)
 	})
 
 	describe("bedrock provider with 1M context", () => {
 
@@ -418,10 +418,9 @@ function getSelectedModel({
 			const info = routerModels["zoo-gateway"]?.[id]
 			return { id, info }
 		}
-		// case providerIdentifiers.anthropic:
-		// case providerIdentifiers.fakeAi:
-		default: {
-			provider satisfies "anthropic" | "gemini-cli" | "fake-ai"
+		case providerIdentifiers.anthropic:
+		case providerIdentifiers.geminiCli:
+		case providerIdentifiers.fakeAi: {
 			const id = apiConfiguration.apiModelId ?? defaultModelId
 			const baseInfo = anthropicModels[id as keyof typeof anthropicModels]
 
@@ -462,5 +461,9 @@ function getSelectedModel({
 
 			return { id, info: baseInfo }
 		}
+		default: {
+			provider satisfies never
+			throw new Error(`Unsupported provider: ${provider}`)
+		}
 	}
 }
Original file line number	Diff line number	Diff line change
`@@ -418,10 +418,9 @@ function getSelectedModel({`
`418`	`418`	`const info = routerModels["zoo-gateway"]?.[id]`
`419`	`419`	`return { id, info }`
`420`	`420`	`}`
`421`		`- // case providerIdentifiers.anthropic:`
`422`		`- // case providerIdentifiers.fakeAi:`
`423`		`- default: {`
`424`		`- provider satisfies "anthropic" \| "gemini-cli" \| "fake-ai"`
	`421`	`+ case providerIdentifiers.anthropic:`
	`422`	`+ case providerIdentifiers.geminiCli:`
	`423`	`+ case providerIdentifiers.fakeAi: {`
`425`	`424`	`const id = apiConfiguration.apiModelId ?? defaultModelId`
`426`	`425`	`const baseInfo = anthropicModels[id as keyof typeof anthropicModels]`
`427`	`426`
`@@ -462,5 +461,9 @@ function getSelectedModel({`
`462`	`461`
`463`	`462`	`return { id, info: baseInfo }`
`464`	`463`	`}`
	`464`	`+ default: {`
	`465`	`+ provider satisfies never`
	`466`	+ throw new Error(`Unsupported provider: ${provider}`)
	`467`	`+ }`
`465`	`468`	`}`
`466`	`469`	`}`