@oh-my-pi/pi-catalog 16.2.8 → 16.2.11

package/CHANGELOG.md

@@ -2,6 +2,39 @@
 
 ## [Unreleased]
 
+## [16.2.11] - 2026-07-01
+
+### Fixed
+
+- Fixed a potential memory leak caused by dangling timeout timers during model discovery in OpenAI-compatible, vLLM, LiteLLM, and LM Studio catalogs.
+- Widened stream watchdogs for local OpenAI-compatible backends (including llama.cpp, LM Studio, vLLM, and Ollama) to prevent premature timeouts during cold model loads.
+
+## [16.2.10] - 2026-06-30
+
+### Added
+
+- Added Claude Sonnet 3.7, Claude Opus 3, and Claude Sonnet 3 model entries to the Anthropic catalog
+- Added Anthropic Claude Sonnet 5 model entry to the Kilo provider catalog
+- Added first-party catalog discovery support for the Anthropic provider
+- Added Gemini 3.1 Flash Lite Image model entry to the Kilo provider catalog
+- Added Anthropic Claude Sonnet 5 model variants with low, medium, high, xhigh, and max thinking efforts to the Devin provider catalog
+- Added Claude Sonnet 5 model entry to the Anthropic curated catalog.
+
+### Changed
+
+- Updated the base API URL for the Claude Sonnet 5 model in the Anthropic catalog
+- Updated pricing metrics for DeepSeek R1 and DeepSeek V3 model entries to reflect new rates
+
+## [16.2.9] - 2026-06-30
+
+### Added
+
+- Added full capability support for Claude Sonnet 5, aligning it with Claude Opus 4.8 and Fable 5. This includes adaptive thinking display, mid-conversation system messages, sampling parameter and thinking omission API restrictions, and 5-tier adaptive reasoning effort mapping (including xhigh and max levels) across direct APIs, OpenRouter, and Bedrock Converse.
+
+### Changed
+
+- Updated input and output costs for models in the catalog.
+
 ## [16.2.7] - 2026-06-30
 
 ### Fixed

package/dist/types/discovery/openai-compatible.d.ts

@@ -48,8 +48,10 @@ export interface FetchOpenAICompatibleModelsOptions<TApi extends Api> {
     apiKey?: string;
     /** Additional request headers. */
     headers?: Record<string, string>;
-    /** Optional AbortSignal for request cancellation. */
+    /** Optional AbortSignal for request cancellation; caller owns its lifecycle. */
     signal?: AbortSignal;
+    /** Optional cancellable request timeout used when `signal` is omitted. */
+    timeoutMs?: number;
     /** Optional fetch implementation override for testing/custom runtimes. */
     fetch?: FetchImpl;
     /**

package/dist/types/identity/classify.d.ts

@@ -56,6 +56,13 @@ export declare const parseOpenAIModel: (modelId: string) => OpenAIModel | null;
  */
 export declare const parseGlmModel: (modelId: string) => GlmModel | null;
 export declare function isFableOrMythos(kind: AnthropicKind): boolean;
+/**
+ * Returns true if the parsed Anthropic model is part of the adaptive-thinking
+ * Claude generation at or above a specific capability threshold.
+ * - Opus has a configurable minimum version floor (e.g. "4.6", "4.7", "4.8").
+ * - Sonnet, Fable, and Mythos all require version 5 or higher.
+ */
+export declare function isAnthropicAdaptiveGenAtLeast(parsed: AnthropicModel, opusMin: "4.6" | "4.7" | "4.8"): boolean;
 export declare function parseSemVer(version: string): SemVer | null;
 export declare function semverGte(left: SemVer | string, right: SemVer | string): boolean;
 export declare function semverEqual(left: SemVer | string, right: SemVer | string): boolean;

package/dist/types/identity/family.d.ts

@@ -85,15 +85,16 @@ export declare const isGlmVisionModelId: (modelId: string) => boolean;
  */
 export declare const modelFamilyToken: (modelId: string) => string;
 /**
- * Adaptive thinking `display` is supported starting with Claude Opus 4.7 and
- * the Claude Fable/Mythos 5 generation. Older adaptive-thinking models
- * (Opus 4.6, Sonnet 4.6+) reject the field. Classifier-based, so dotted and
- * dashed version forms both match while bare dated ids
+ * Adaptive thinking `display` is supported starting with Claude Opus 4.7+,
+ * Sonnet 5+, and the Claude Fable/Mythos 5 generation. Older adaptive-thinking
+ * models (Opus 4.6, Sonnet 4.6) reject the field. Classifier-based, so dotted
+ * and dashed version forms both match while bare dated ids
  * (`claude-opus-4-20250514` = Opus 4.0) stay excluded.
  */
 export declare const supportsAdaptiveThinkingDisplay: (modelId: string) => boolean;
 /**
- * Returns true for Anthropic models with Opus 4.7+/Fable/Mythos API restrictions:
+ * Returns true for Anthropic models with Opus 4.7+, Sonnet 5+, and Fable/Mythos 5+
+ * API restrictions:
  * - Sampling parameters (temperature/top_p/top_k) return 400 error
  * - Thinking content is omitted by default (needs display: "summarized")
  */
@@ -101,8 +102,8 @@ export declare const hasOpus47ApiRestrictions: (modelId: string) => boolean;
 /**
  * Mid-conversation `role: "system"` messages (system instructions appended at
  * non-first positions in the `messages` array) are supported starting with
- * Claude Opus 4.8 and the Claude Fable/Mythos 5 generation. Earlier Claude
- * models reject the role.
+ * Claude Opus 4.8+, Sonnet 5+, and the Claude Fable/Mythos 5 generation.
+ * Earlier Claude models reject the role.
  * @see https://platform.claude.com/docs/en/build-with-claude/mid-conversation-system-messages
  */
 export declare const supportsMidConversationSystemMessages: (modelId: string) => boolean;

package/dist/types/provider-models/descriptors.d.ts

@@ -29,7 +29,11 @@ export declare const CATALOG_PROVIDERS: readonly [{
 }, {
     readonly id: "anthropic";
     readonly defaultModel: "claude-opus-4-8";
+    readonly envVars: readonly ["ANTHROPIC_API_KEY"];
     readonly createModelManagerOptions: (config: ModelManagerConfig) => import("..").ModelManagerOptions<"anthropic-messages", unknown>;
+    readonly catalogDiscovery: {
+        readonly label: "Anthropic";
+    };
 }, {
     readonly id: "azure";
     readonly defaultModel: "gpt-5.5";

package/dist/types/provider-models/openai-compat.d.ts

@@ -29,8 +29,8 @@ export interface ModelsDevModel {
  * first-party `/v1/models` endpoint but that models.dev has not catalogued yet.
  * Seeded into model generation so the bundled catalog is never gated on
  * models.dev's update cadence; deduped behind upstream catalog / models.dev
- * entries once those appear. Token limits and pricing are pinned
- * authoritatively in `applyAnthropicCatalogPolicy`, and `thinking` is re-baked
+ * entries once those appear. Token limits and pricing are pinned either directly or
+ * in `applyAnthropicCatalogPolicy`, and `thinking` is re-baked
  * by the generator's policy pass (scripts/generated-policies.ts).
  */
 export declare const ANTHROPIC_CURATED_FALLBACK_MODELS: readonly ModelSpec<"anthropic-messages">[];
@@ -371,6 +371,7 @@ export interface FetchLiteLLMRichModelsOptions<TApi extends Api> {
     headers?: Record<string, string>;
     fetch?: FetchImpl;
     signal?: AbortSignal;
+    timeoutMs?: number;
     referenceResolver?: (modelId: string) => ModelSpec<TApi> | undefined;
 }
 export declare const OPENAI_COMPAT_DISCOVERY_DEFAULT_CONTEXT_WINDOW = 128000;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-catalog",
-	"version": "16.2.8",
+	"version": "16.2.11",
 	"description": "Model catalog for omp: bundled model database, provider discovery descriptors, model identity, classification, and equivalence",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -34,12 +34,12 @@
 	},
 	"dependencies": {
 		"@bufbuild/protobuf": "^2.12.0",
-		"@oh-my-pi/pi-utils": "16.2.8",
+		"@oh-my-pi/pi-utils": "16.2.11",
 		"arktype": "^2.2.0",
 		"zod": "^4"
 	},
 	"devDependencies": {
-		"@oh-my-pi/pi-ai": "16.2.8",
+		"@oh-my-pi/pi-ai": "16.2.11",
 		"@types/bun": "^1.3.14"
 	},
 	"engines": {

package/src/compat/openai.ts

@@ -57,6 +57,8 @@ function matchesKimiK27CodeFamily(spec: ModelSpec<"openai-completions">): boolea
 const XIAOMI_MIMO_STREAM_IDLE_TIMEOUT_MS = 300_000;
 /** Alibaba Coding Plan (coding-intl.dashscope) qwen models idle before the first event (issue #1770). */
 const ALIBABA_CODING_PLAN_STREAM_IDLE_TIMEOUT_MS = 600_000;
+/** Local OpenAI-compatible backends can spend minutes cold-loading a model before the first SSE event. */
+const LOCAL_OPENAI_COMPAT_STREAM_IDLE_TIMEOUT_MS = 300_000;
 const MINIMAX_PROVIDER_OR_ID_PATTERN = /minimax/i;
 const DSML_HEALING_PROVIDERS = new Set([
 	"ollama",
@@ -294,6 +296,9 @@ export function buildOpenAICompat(spec: ModelSpec<"openai-completions">): Resolv
 		isMoonshotNative ||
 		isOpenCodeHost;
 	const isOpenCodeProvider = provider === "opencode-go" || provider === "opencode-zen";
+	const isLocalOpenAICompatBackend =
+		!PROXY_OPENAI_COMPAT_PROVIDERS.has(provider) &&
+		(LOCAL_OPENAI_COMPAT_PROVIDERS.has(provider) || hasLocalLoopbackBaseUrl(baseUrl));
 
 	const useMaxTokens =
 		isMistral ||
@@ -348,9 +353,10 @@ export function buildOpenAICompat(spec: ModelSpec<"openai-completions">): Resolv
 			isCopilotHost ||
 			isZenmuxHost);
 
-	// Stream-watchdog floor: GLM coding-plan SKUs, Kimi K2.6, and direct
-	// DeepSeek reasoning models can idle for minutes while reasoning; widen the
-	// idle timeout so warm-ups stop aborting and retrying.
+	// Stream-watchdog floor: GLM coding-plan SKUs, Kimi K2.6, direct
+	// DeepSeek reasoning models, and local OpenAI-compatible backends can idle
+	// for minutes while reasoning or cold-loading weights; widen the idle
+	// timeout so warm-ups stop aborting and retrying.
 	const streamIdleTimeoutMs =
 		GLM_CODING_PLAN_MODEL_PATTERN.test(spec.id) && (isZai || isZhipu)
 			? GLM_CODING_PLAN_STREAM_IDLE_TIMEOUT_MS
@@ -362,7 +368,9 @@ export function buildOpenAICompat(spec: ModelSpec<"openai-completions">): Resolv
 						? KIMI_K26_REASONING_STREAM_IDLE_TIMEOUT_MS
 						: spec.reasoning && isDirectDeepseekApi
 							? DEEPSEEK_REASONING_STREAM_IDLE_TIMEOUT_MS
-							: undefined;
+							: isLocalOpenAICompatBackend
+								? LOCAL_OPENAI_COMPAT_STREAM_IDLE_TIMEOUT_MS
+								: undefined;
 
 	// Fireworks "Fast" variants (`<id>-fast`) are served from the router
 	// namespace (`accounts/fireworks/routers/<id>-fast`), like Fire Pass, rather
@@ -482,9 +490,7 @@ export function buildOpenAICompat(spec: ModelSpec<"openai-completions">): Resolv
 		// when a thinking block actually exists on the turn
 		// (`nonEmptyThinkingBlocks.length > 0`), so the flag is a no-op on
 		// pure-text histories.
-		replayReasoningContent:
-			!PROXY_OPENAI_COMPAT_PROVIDERS.has(provider) &&
-			(LOCAL_OPENAI_COMPAT_PROVIDERS.has(provider) || hasLocalLoopbackBaseUrl(baseUrl)),
+		replayReasoningContent: isLocalOpenAICompatBackend,
 		// `preserve_thinking: true` makes the Qwen3.6+ chat template render
 		// `<think>...</think>` for older assistant turns too, instead of
 		// stripping it the moment a new user message moves them past
@@ -496,9 +502,7 @@ export function buildOpenAICompat(spec: ModelSpec<"openai-completions">): Resolv
 		// with `replayReasoningContent` above). Non-Qwen templates ignore the
 		// parameter, so the flag stays a no-op outside the Qwen path.
 		qwenPreserveThinking:
-			(thinkingFormat === "qwen" || thinkingFormat === "qwen-chat-template") &&
-			!PROXY_OPENAI_COMPAT_PROVIDERS.has(provider) &&
-			(LOCAL_OPENAI_COMPAT_PROVIDERS.has(provider) || hasLocalLoopbackBaseUrl(baseUrl)),
+			(thinkingFormat === "qwen" || thinkingFormat === "qwen-chat-template") && isLocalOpenAICompatBackend,
 		requiresAssistantContentForToolCalls: isKimiModel || isDirectDeepseekReasoning,
 		cacheControlFormat: isOpenRouter && spec.id.startsWith("anthropic/") ? "anthropic" : undefined,
 		openRouterRouting: undefined,
@@ -584,6 +588,9 @@ export function buildOpenAIResponsesCompat(spec: OpenAIResponsesSpecLike): Resol
 	const isAnthropicModel = id ? isClaudeModelId(id) || isAnthropicNamespacedModelId(id) : false;
 	const isDeepseekFamily = id ? isDeepseekModelIdOrName(id) || isDeepseekModelIdOrName(spec.name) : false;
 	const reasoningCapable = Boolean(spec.reasoning);
+	const isLocalOpenAICompatBackend =
+		!PROXY_OPENAI_COMPAT_PROVIDERS.has(spec.provider) &&
+		(LOCAL_OPENAI_COMPAT_PROVIDERS.has(spec.provider) || hasLocalLoopbackBaseUrl(baseUrl));
 
 	const compat: ResolvedOpenAIResponsesCompat = {
 		supportsDeveloperRole: isAzure || isOpenAIUrl || hostMatchesUrl(baseUrl, "githubCopilot"),
@@ -645,7 +652,9 @@ export function buildOpenAIResponsesCompat(spec: OpenAIResponsesSpecLike): Resol
 		emptyLengthFinishIsContextError: spec.provider === "ollama",
 		usesOpenAIToolCallIdLimit: spec.provider === "openai",
 		promptCacheSessionHeader: spec.provider === "xai-oauth" ? "x-grok-conv-id" : undefined,
-		streamIdleTimeoutMs: spec.compat?.streamIdleTimeoutMs,
+		streamIdleTimeoutMs: isLocalOpenAICompatBackend
+			? LOCAL_OPENAI_COMPAT_STREAM_IDLE_TIMEOUT_MS
+			: spec.compat?.streamIdleTimeoutMs,
 	};
 	applyCompatOverrides(compat, spec.compat);
 	if (spec.compat?.reasoningDisableMode === undefined) {

package/src/discovery/openai-compatible.ts

@@ -3,6 +3,27 @@ import type { Api, FetchImpl, ModelSpec, Provider } from "../types";
 
 const MODELS_PATH = "/models";
 
+/**
+ * Uses a cancellable timer rather than the native abort-timeout helper so
+ * successful fast discovery requests do not leave armed timeout signals for
+ * concurrent GC to trip over later.
+ */
+async function withOpenAICompatibleDiscoveryTimeout<T>(
+	timeoutMs: number,
+	run: (signal: AbortSignal) => Promise<T>,
+): Promise<T> {
+	const controller = new AbortController();
+	const timer = setTimeout(
+		() => controller.abort(new DOMException("The operation timed out.", "TimeoutError")),
+		timeoutMs,
+	);
+	try {
+		return await run(controller.signal);
+	} finally {
+		clearTimeout(timer);
+	}
+}
+
 /**
  * Minimal OpenAI-style model entry shape consumed by discovery.
  *
@@ -72,8 +93,10 @@ export interface FetchOpenAICompatibleModelsOptions<TApi extends Api> {
 	apiKey?: string;
 	/** Additional request headers. */
 	headers?: Record<string, string>;
-	/** Optional AbortSignal for request cancellation. */
+	/** Optional AbortSignal for request cancellation; caller owns its lifecycle. */
 	signal?: AbortSignal;
+	/** Optional cancellable request timeout used when `signal` is omitted. */
+	timeoutMs?: number;
 	/** Optional fetch implementation override for testing/custom runtimes. */
 	fetch?: FetchImpl;
 	/**
@@ -115,25 +138,35 @@ export async function fetchOpenAICompatibleModels<TApi extends Api>(
 	}
 
 	const fetchImpl = options.fetch ?? globalThis.fetch;
-	let response: Response;
-	try {
-		response = await fetchImpl(`${baseUrl}${MODELS_PATH}`, {
-			method: "GET",
-			headers: requestHeaders,
-			signal: options.signal,
-		});
-	} catch {
-		return null;
-	}
+	const fetchPayload = async (signal?: AbortSignal): Promise<unknown | null> => {
+		let response: Response;
+		try {
+			response = await fetchImpl(`${baseUrl}${MODELS_PATH}`, {
+				method: "GET",
+				headers: requestHeaders,
+				signal,
+			});
+		} catch {
+			return null;
+		}
 
-	if (!response.ok) {
-		return null;
-	}
+		if (!response.ok) {
+			return null;
+		}
 
-	let payload: unknown;
-	try {
-		payload = await response.json();
-	} catch {
+		try {
+			return await response.json();
+		} catch {
+			return null;
+		}
+	};
+	const payload =
+		options.signal !== undefined
+			? await fetchPayload(options.signal)
+			: options.timeoutMs !== undefined
+				? await withOpenAICompatibleDiscoveryTimeout(options.timeoutMs, fetchPayload)
+				: await fetchPayload();
+	if (payload === null) {
 		return null;
 	}
 

package/src/identity/classify.ts

@@ -158,6 +158,20 @@ export function isFableOrMythos(kind: AnthropicKind): boolean {
 	return kind === "fable" || kind === "mythos";
 }
 
+/**
+ * Returns true if the parsed Anthropic model is part of the adaptive-thinking
+ * Claude generation at or above a specific capability threshold.
+ * - Opus has a configurable minimum version floor (e.g. "4.6", "4.7", "4.8").
+ * - Sonnet, Fable, and Mythos all require version 5 or higher.
+ */
+export function isAnthropicAdaptiveGenAtLeast(parsed: AnthropicModel, opusMin: "4.6" | "4.7" | "4.8"): boolean {
+	if (parsed.kind === "opus") {
+		return semverGte(parsed.version, opusMin);
+	}
+	// Sonnet 5+, Fable 5+, Mythos 5+, and any future gen-5+ models
+	return semverGte(parsed.version, "5");
+}
+
 function createSemVer(major: number, minor: number, patch = 0): SemVer {
 	return { major, minor, patch };
 }

package/src/identity/family.ts

@@ -9,6 +9,7 @@
 
 import {
 	bareModelId,
+	isAnthropicAdaptiveGenAtLeast,
 	isFableOrMythos,
 	parseAnthropicModel,
 	parseGlmModel,
@@ -201,41 +202,38 @@ export const modelFamilyToken = memo((modelId: string): string => {
 });
 
 /**
- * Adaptive thinking `display` is supported starting with Claude Opus 4.7 and
- * the Claude Fable/Mythos 5 generation. Older adaptive-thinking models
- * (Opus 4.6, Sonnet 4.6+) reject the field. Classifier-based, so dotted and
- * dashed version forms both match while bare dated ids
+ * Adaptive thinking `display` is supported starting with Claude Opus 4.7+,
+ * Sonnet 5+, and the Claude Fable/Mythos 5 generation. Older adaptive-thinking
+ * models (Opus 4.6, Sonnet 4.6) reject the field. Classifier-based, so dotted
+ * and dashed version forms both match while bare dated ids
  * (`claude-opus-4-20250514` = Opus 4.0) stay excluded.
  */
 export const supportsAdaptiveThinkingDisplay = memo((modelId: string): boolean => {
 	const parsed = parseAnthropicModel(bareModelId(modelId));
-	if (!parsed) return false;
-	if (isFableOrMythos(parsed.kind)) return semverGte(parsed.version, "5");
-	return parsed.kind === "opus" && semverGte(parsed.version, "4.7");
+	return parsed !== null && isAnthropicAdaptiveGenAtLeast(parsed, "4.7");
 });
 
 /**
- * Returns true for Anthropic models with Opus 4.7+/Fable/Mythos API restrictions:
+ * Returns true for Anthropic models with Opus 4.7+, Sonnet 5+, and Fable/Mythos 5+
+ * API restrictions:
  * - Sampling parameters (temperature/top_p/top_k) return 400 error
  * - Thinking content is omitted by default (needs display: "summarized")
  */
 export const hasOpus47ApiRestrictions = memo((modelId: string): boolean => {
 	const parsed = parseAnthropicModel(bareModelId(modelId));
-	if (!parsed) return false;
-	return (parsed.kind === "opus" && semverGte(parsed.version, "4.7")) || isFableOrMythos(parsed.kind);
+	return parsed !== null && isAnthropicAdaptiveGenAtLeast(parsed, "4.7");
 });
 
 /**
  * Mid-conversation `role: "system"` messages (system instructions appended at
  * non-first positions in the `messages` array) are supported starting with
- * Claude Opus 4.8 and the Claude Fable/Mythos 5 generation. Earlier Claude
- * models reject the role.
+ * Claude Opus 4.8+, Sonnet 5+, and the Claude Fable/Mythos 5 generation.
+ * Earlier Claude models reject the role.
  * @see https://platform.claude.com/docs/en/build-with-claude/mid-conversation-system-messages
  */
 export const supportsMidConversationSystemMessages = memo((modelId: string): boolean => {
 	const parsed = parseAnthropicModel(bareModelId(modelId));
-	if (!parsed) return false;
-	return (parsed.kind === "opus" && semverGte(parsed.version, "4.8")) || isFableOrMythos(parsed.kind);
+	return parsed !== null && isAnthropicAdaptiveGenAtLeast(parsed, "4.8");
 });
 
 export const isAnthropicFableOrMythosModel = memo((modelId: string): boolean => {

package/src/model-thinking.ts

@@ -12,7 +12,7 @@ import {
 	type AnthropicModel,
 	bareModelId,
 	type GeminiModel,
-	isFableOrMythos,
+	isAnthropicAdaptiveGenAtLeast,
 	type OpenAIModel,
 	type ParsedModel,
 	parseAnthropicModel,
@@ -441,12 +441,11 @@ function isDeepseekReasoningModel<TApi extends Api>(spec: ModelSpec<TApi>): bool
 function getOpenRouterAnthropicReasoningEffortMap(modelId: string): EffortMap | undefined {
 	const parsed = parseAnthropicModel(bareModelId(modelId));
 	if (!parsed) return undefined;
-	// Adaptive efforts on OpenRouter's completions front: Fable/Mythos and
-	// Opus 4.6+ only — Sonnet stays on the plain effort vocabulary there.
-	const isOpusAdaptive = parsed.kind === "opus" && semverGte(parsed.version, "4.6");
-	if (!isFableOrMythos(parsed.kind) && !isOpusAdaptive) return undefined;
+	// Adaptive efforts on OpenRouter's completions front: Fable/Mythos, Sonnet 5+,
+	// and Opus 4.6+ only — older Sonnet versions stay on the plain effort vocabulary there.
+	if (!isAnthropicAdaptiveGenAtLeast(parsed, "4.6")) return undefined;
 
-	const hasRealXHigh = isFableOrMythos(parsed.kind) || semverGte(parsed.version, "4.7");
+	const hasRealXHigh = isAnthropicAdaptiveGenAtLeast(parsed, "4.7");
 	return hasRealXHigh ? ANTHROPIC_ADAPTIVE_EFFORT_MAP_5_TIER : ANTHROPIC_ADAPTIVE_EFFORT_MAP_4_TIER;
 }
 
@@ -521,7 +520,7 @@ function inferAnthropicSupportedEfforts<TApi extends Api>(
 		(spec.api === "anthropic-messages" || spec.api === "bedrock-converse-stream") &&
 		semverGte(parsedModel.version, "4.6")
 	) {
-		return parsedModel.kind === "opus" || isFableOrMythos(parsedModel.kind)
+		return isAnthropicAdaptiveGenAtLeast(parsedModel, "4.6")
 			? DEFAULT_REASONING_EFFORTS_WITH_XHIGH
 			: DEFAULT_REASONING_EFFORTS;
 	}
@@ -601,10 +600,7 @@ function inferThinkingControlMode<TApi extends Api>(
 
 		case "bedrock-converse-stream":
 			if (parsedModel.family === "anthropic") {
-				if (
-					semverGte(parsedModel.version, "4.6") &&
-					(parsedModel.kind === "opus" || isFableOrMythos(parsedModel.kind))
-				) {
+				if (isAnthropicAdaptiveGenAtLeast(parsedModel, "4.6")) {
 					return "anthropic-adaptive";
 				}
 				// Opus 4.5 on Bedrock metadata mirrors the direct-Anthropic
@@ -627,19 +623,18 @@ function isOpenRouterAnthropicAdaptiveReasoningModel<TApi extends Api>(
 ): boolean {
 	if (!isOpenAICompatReasoningApi(spec.api)) return false;
 	if (!modelMatchesHost(spec, "openrouter")) return false;
-	return isFableOrMythos(parsedModel.kind) || (parsedModel.kind === "opus" && semverGte(parsedModel.version, "4.6"));
+	return isAnthropicAdaptiveGenAtLeast(parsedModel, "4.6");
 }
 
 /**
- * Opus 4.7+ and Fable/Mythos on the Messages API expose the full five-tier
+ * Opus 4.7+, Sonnet 5+, and Fable/Mythos 5+ on the Messages API expose the full five-tier
  * adaptive scale (low/medium/high/xhigh/max). Bedrock Converse stays on the
  * four-tier scale regardless of model version.
  */
 function anthropicModelHasRealXHighEffort<TApi extends Api>(spec: ModelSpec<TApi>, parsedModel: ParsedModel): boolean {
 	if (spec.api !== "anthropic-messages") return false;
 	if (parsedModel.family !== "anthropic") return false;
-	if (isFableOrMythos(parsedModel.kind)) return true;
-	return parsedModel.kind === "opus" && semverGte(parsedModel.version, "4.7");
+	return isAnthropicAdaptiveGenAtLeast(parsedModel, "4.7");
 }
 
 // ---------------------------------------------------------------------------