@ottocode/sdk 0.1.310 → 0.1.312

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ottocode/sdk",
-	"version": "0.1.310",
+	"version": "0.1.312",
 	"description": "AI agent SDK for building intelligent assistants - tree-shakable and comprehensive",
 	"author": "nitishxyz",
 	"license": "MIT",
@@ -109,7 +109,7 @@
 		"@modelcontextprotocol/sdk": "1.27.1",
 		"@openauthjs/openauth": "0.4.3",
 		"@openrouter/ai-sdk-provider": "1.5.4",
-		"@ottorouter/ai-sdk": "0.2.6",
+		"@ottorouter/ai-sdk": "0.2.7",
 		"@solana/web3.js": "1.98.4",
 		"ai": "6.0.199",
 		"ai-sdk-ollama": "3.8.3",

package/src/auth/src/index.ts

@@ -97,6 +97,15 @@ export {
 	type XaiOAuthTokens,
 } from './xai-oauth.ts';
 
+export {
+	refreshKimiToken,
+	requestKimiDeviceCode,
+	pollKimiDeviceCodeOnce,
+	type KimiOAuthTokens,
+	type KimiDeviceCodeResponse,
+	type KimiDevicePollResult,
+} from './kimi-oauth.ts';
+
 export {
 	generateWallet,
 	importWallet,

package/src/auth/src/kimi-oauth.ts

@@ -0,0 +1,196 @@
+const KIMI_CODE_OAUTH_CLIENT_ID = '17e5f671-d194-4dfb-9706-5516cb48c098';
+
+function kimiOAuthHost(): string {
+	return (
+		process.env.KIMI_CODE_OAUTH_HOST ??
+		process.env.KIMI_OAUTH_HOST ??
+		'https://auth.kimi.com'
+	);
+}
+
+/** Kimi Code OAuth tokens normalized to otto's OAuth shape (expires in epoch ms). */
+export type KimiOAuthTokens = {
+	access: string;
+	refresh: string;
+	expires: number;
+	scopes?: string;
+};
+
+/** Response from a Kimi Code OAuth device authorization request. */
+export type KimiDeviceCodeResponse = {
+	userCode: string;
+	deviceCode: string;
+	verificationUri: string;
+	interval: number;
+	expiresIn: number | null;
+};
+
+/** Result of a single Kimi device-code token poll attempt. */
+export type KimiDevicePollResult =
+	| { status: 'complete'; tokens: KimiOAuthTokens }
+	| { status: 'pending' }
+	| { status: 'error'; error: string };
+
+/**
+ * Request a Kimi Code OAuth device authorization code.
+ *
+ * Mirrors the kimi-cli device flow: form-encoded POST to
+ * `https://auth.kimi.com/api/oauth/device_authorization` with `client_id`.
+ */
+export async function requestKimiDeviceCode(): Promise<KimiDeviceCodeResponse> {
+	const response = await fetch(
+		`${kimiOAuthHost().replace(/\/$/, '')}/api/oauth/device_authorization`,
+		{
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+				Accept: 'application/json',
+			},
+			body: new URLSearchParams({
+				client_id: KIMI_CODE_OAUTH_CLIENT_ID,
+			}).toString(),
+		},
+	);
+	const data = (await response.json().catch(() => ({}))) as Record<
+		string,
+		unknown
+	>;
+	if (!response.ok) {
+		throw new Error(
+			`Kimi OAuth device authorization failed (${response.status})`,
+		);
+	}
+	const userCode = data.user_code;
+	const deviceCode = data.device_code;
+	const verificationUriComplete = data.verification_uri_complete;
+	if (
+		typeof userCode !== 'string' ||
+		typeof deviceCode !== 'string' ||
+		typeof verificationUriComplete !== 'string'
+	) {
+		throw new Error('Kimi OAuth device authorization response was incomplete.');
+	}
+	return {
+		userCode,
+		deviceCode,
+		verificationUri: verificationUriComplete,
+		interval: Number(data.interval ?? 5),
+		expiresIn:
+			data.expires_in === undefined || data.expires_in === null
+				? null
+				: Number(data.expires_in),
+	};
+}
+
+/**
+ * Poll the Kimi Code OAuth token endpoint once for a device-code grant.
+ *
+ * Returns `pending` while authorization is outstanding (including
+ * `slow_down`), `complete` with normalized tokens on success, and `error`
+ * for terminal failures such as `expired_token` or `access_denied`.
+ */
+export async function pollKimiDeviceCodeOnce(
+	deviceCode: string,
+): Promise<KimiDevicePollResult> {
+	const response = await fetch(
+		`${kimiOAuthHost().replace(/\/$/, '')}/api/oauth/token`,
+		{
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+				Accept: 'application/json',
+			},
+			body: new URLSearchParams({
+				client_id: KIMI_CODE_OAUTH_CLIENT_ID,
+				device_code: deviceCode,
+				grant_type: 'urn:ietf:params:oauth:grant-type:device_code',
+			}).toString(),
+		},
+	);
+	const data = (await response.json().catch(() => ({}))) as Record<
+		string,
+		unknown
+	>;
+	if (response.ok && typeof data.access_token === 'string') {
+		const expiresIn = Number(data.expires_in ?? 0);
+		return {
+			status: 'complete',
+			tokens: {
+				access: data.access_token,
+				refresh:
+					typeof data.refresh_token === 'string' ? data.refresh_token : '',
+				expires: Date.now() + expiresIn * 1000,
+				scopes: typeof data.scope === 'string' ? data.scope : undefined,
+			},
+		};
+	}
+	const errorCode =
+		typeof data.error === 'string' ? data.error : 'unknown_error';
+	if (errorCode === 'authorization_pending' || errorCode === 'slow_down') {
+		return { status: 'pending' };
+	}
+	if (errorCode === 'expired_token') {
+		return { status: 'error', error: 'Kimi OAuth code expired.' };
+	}
+	if (errorCode === 'access_denied') {
+		return { status: 'error', error: 'Kimi OAuth access denied.' };
+	}
+	return {
+		status: 'error',
+		error: `Kimi OAuth token polling failed: ${errorCode}`,
+	};
+}
+
+/**
+ * Refresh a Kimi Code OAuth access token using the refresh_token grant.
+ *
+ * Mirrors the official kimi-cli flow: form-encoded POST to
+ * `https://auth.kimi.com/api/oauth/token` with `client_id`,
+ * `grant_type=refresh_token`, and `refresh_token`. Kimi rotates refresh
+ * tokens on every refresh, so callers must persist the returned tokens.
+ */
+export async function refreshKimiToken(
+	refreshToken: string,
+): Promise<KimiOAuthTokens> {
+	const response = await fetch(
+		`${kimiOAuthHost().replace(/\/$/, '')}/api/oauth/token`,
+		{
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+				Accept: 'application/json',
+			},
+			body: new URLSearchParams({
+				client_id: KIMI_CODE_OAUTH_CLIENT_ID,
+				grant_type: 'refresh_token',
+				refresh_token: refreshToken,
+			}).toString(),
+		},
+	);
+	const data = (await response.json().catch(() => ({}))) as Record<
+		string,
+		unknown
+	>;
+	if (!response.ok || typeof data.access_token !== 'string') {
+		const description =
+			typeof data.error_description === 'string'
+				? data.error_description
+				: `HTTP ${response.status}`;
+		if (response.status === 401 || response.status === 403) {
+			throw new Error(
+				`Kimi OAuth refresh token rejected (${description}). Run \`otto auth login kimi\` again.`,
+			);
+		}
+		throw new Error(`Kimi OAuth token refresh failed: ${description}`);
+	}
+	const expiresIn = Number(data.expires_in ?? 0);
+	return {
+		access: data.access_token,
+		refresh:
+			typeof data.refresh_token === 'string' && data.refresh_token
+				? data.refresh_token
+				: refreshToken,
+		expires: Date.now() + expiresIn * 1000,
+		scopes: typeof data.scope === 'string' ? data.scope : undefined,
+	};
+}

package/src/core/src/providers/resolver.ts

@@ -7,7 +7,7 @@ import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
 import {
 	catalog,
 	createMinimaxModel,
-	createMoonshotModel,
+	createKimiModel,
 	createOttoRouterModel,
 	createOpenAIOAuthModel,
 	createXaiModel,
@@ -34,6 +34,7 @@ export type ProviderName =
 	| 'zai'
 	| 'zai-coding'
 	| 'moonshot'
+	| 'kimi'
 	| 'minimax';
 
 export type ModelConfig = {
@@ -221,10 +222,11 @@ export async function resolveModel(
 		});
 	}
 
-	if (provider === 'moonshot') {
-		return createMoonshotModel(model, {
+	if (provider === 'moonshot' || provider === 'kimi') {
+		return createKimiModel(model, {
 			apiKey: config.apiKey,
 			baseURL: config.baseURL,
+			oauth: config.oauth,
 		});
 	}
 

package/src/index.ts

@@ -160,8 +160,15 @@ export {
 export type { OpenRouterProviderConfig } from './providers/src/index.ts';
 export { createOpencodeModel } from './providers/src/index.ts';
 export type { OpencodeProviderConfig } from './providers/src/index.ts';
-export { createMoonshotModel } from './providers/src/index.ts';
-export type { MoonshotProviderConfig } from './providers/src/index.ts';
+export {
+	createKimiModel,
+	createMoonshotModel,
+	readKimiApiKeyFromEnv,
+} from './providers/src/index.ts';
+export type {
+	KimiProviderConfig,
+	MoonshotProviderConfig,
+} from './providers/src/index.ts';
 export { createMinimaxModel } from './providers/src/index.ts';
 export type { MinimaxProviderConfig } from './providers/src/index.ts';
 export {
@@ -211,6 +218,16 @@ export {
 	readGrokCliAuth,
 } from './auth/src/index.ts';
 export type { XaiOAuthResult, XaiOAuthTokens } from './auth/src/index.ts';
+export {
+	refreshKimiToken,
+	requestKimiDeviceCode,
+	pollKimiDeviceCodeOnce,
+} from './auth/src/index.ts';
+export type {
+	KimiOAuthTokens,
+	KimiDeviceCodeResponse,
+	KimiDevicePollResult,
+} from './auth/src/index.ts';
 export {
 	generateWallet,
 	importWallet,

package/src/prompts/src/agents/otto.txt

@@ -1,32 +1,34 @@
-You are otto, the supervisor agent for ottocode. You wake up after a main session's run finishes to keep its goal on track. You are a bookkeeper and nudger, not the worker: you verify, update task state, and enqueue continuations. You never edit files.
+You are otto, the orchestrator agent for ottocode. You own the goal and its task queue. You are the only writer of goal state: workers never see or update goals. You verify, update task state, and dispatch work. You never edit files.
 
 # Your job each wakeup
 
 1. Read the goal and task list provided in the wake message (use goal_list for the latest state).
-2. Read the recent main-session conversation in the wake message. It shows what the user actually asked for, how the agent replied, and how your own previous [otto] continuations were answered.
-3. Verify claims mechanically. For each task in done_pending:
+2. Read the recent worker-session conversation in the wake message. It shows what the user actually asked for, how the agent replied, and how your own previous [otto] continuations were answered.
+3. Verify finished work mechanically. For each in_progress task whose work appears finished (the worker replied, or a delegated sub-agent returned a result):
    - Use read, ls, tree, search, and glob to check that the claimed artifacts actually exist (files created, code changed, etc.).
-   - The agent's reply in the conversation counts as evidence: if it directly confirms the work (e.g. it ran the check you asked for and reported the result), accept it.
+   - The agent's reply or the delegation result counts as evidence: if it directly confirms the work (e.g. it ran the check you asked for and reported the result), accept it.
    - Task wording can be stale: if the user changed direction mid-goal, trust the task note and the conversation over the original task text. A task whose intent was satisfied a different way is completed, not dubious.
    - Verification passed → set the task to completed via goal_update.
-   - Clearly false (artifact missing) → reset the task to in_progress with a note explaining what is missing.
-   - Ambiguous AND not already answered in the conversation → leave it in done_pending and ask the main agent to confirm via enqueue_session_message. Ask once: if the conversation shows you already asked and got an answer, act on the answer instead of re-asking.
+   - Clearly unfinished (artifact missing) → keep the task in_progress with a note explaining what is missing.
+   - Ambiguous AND not already answered in the conversation → ask the worker to confirm via enqueue_session_message or message_subagent. Ask once: if the conversation shows you already asked and got an answer, act on the answer instead of re-asking.
 4. Decide the next move:
    - All tasks completed → complete the goal (goal_update with completeGoal) and stop. Do not enqueue anything.
-   - Tasks remain and the last run succeeded → enqueue a short continuation into the main session listing the next task(s), reminding the agent to mark the task in_progress before starting it.
-   - The last run errored → enqueue a continuation describing the error and asking the main agent to recover or retry.
-   - Sub-agents are still running for tasks → do not enqueue duplicate work for those tasks.
+   - Tasks remain and the last run succeeded → dispatch the next task(s): mark them in_progress via goal_update (recording the worker sessionId), then delegate with delegate_task or enqueue a short continuation into the worker session.
+   - Session reuse: when a task continues or relates to earlier work done by the same agent, pass that agent's previous child session id as reuseSessionId in delegate_task (completed tasks record it as sessionId in the goal). The worker keeps its context instead of re-discovering the codebase. Use a fresh session for unrelated work.
+   - Independent tasks may be dispatched in parallel to different agents; sequential tasks follow queue order.
+   - The last run errored → enqueue a continuation describing the error and asking the worker to recover or retry.
+   - Sub-agents are still running for tasks → do not dispatch duplicate work for those tasks.
 5. If nothing useful can be done (no goal, nothing stale, nothing errored), do nothing and finish.
 
 # Rules
 
-- Never deeply judge code correctness. You check existence and obvious mechanical facts only; the main agent is the judge of its own work.
-- Only you may set task status to completed. Regular agents claim with done_pending.
+- Never deeply judge code correctness. You check existence and obvious mechanical facts only; the worker is the judge of its own work.
+- You are the only writer of goal state. Workers have no goal tools; never instruct them to update goals.
 - Never send the same (or nearly the same) continuation twice. If your previous message was answered, act on it; if it was ignored twice, mark the affected task blocked with a note and stop.
 - If the user's latest instruction makes a task obsolete, cancel that task with a note instead of nudging the agent to do outdated work.
 - Keep enqueued messages short and directive: which tasks remain, what to confirm, what failed.
-- Sub-agent results are delivered to the main session automatically. Never repeat, summarize, or re-send them; the main agent already has them.
-- If the user stopped the main session, you will not be woken. If a wake message ever overlaps with a user abort, do nothing.
-- Enqueue at most one continuation per wakeup.
+- Sub-agent results are delivered to the dispatching session automatically. Never repeat, summarize, or re-send them.
+- If the user stopped the worker session, you will not be woken. If a wake message ever overlaps with a user abort, do nothing.
+- Enqueue at most one continuation per worker session per wakeup.
 - Never ask the user questions. If something needs the user, mark the task blocked with a note and stop.
 - Be cheap: minimal tool calls, minimal output.

package/src/providers/src/catalog-manual.ts

@@ -1,7 +1,7 @@
 import {
 	ottorouterCatalog,
 	type OttoRouterModelCatalogEntry,
-} from '@ottorouter/ai-sdk';
+} from '@ottorouter/ai-sdk/catalog';
 import type {
 	BuiltInProviderId,
 	ModelInfo,
@@ -14,6 +14,20 @@ type CatalogMap = Partial<Record<BuiltInProviderId, ProviderCatalogEntry>>;
 const OLLAMA_CLOUD_ID: BuiltInProviderId = 'ollama-cloud';
 const OTTOROUTER_ID: BuiltInProviderId = 'ottorouter';
 
+const KIMI_K2_7_CODE_MODEL: ModelInfo = {
+	id: 'kimi-k2.7-code',
+	ownedBy: 'moonshot',
+	label: 'Kimi K2.7 Code',
+	modalities: { input: ['text', 'image', 'video'], output: ['text'] },
+	toolCall: true,
+	reasoningText: true,
+	attachment: true,
+	temperature: 1,
+	cost: { input: 0.95, output: 4, cacheRead: 0.19 },
+	limit: { context: 262_144, output: 32_768 },
+	provider: { npm: '@ai-sdk/openai-compatible' },
+};
+
 const XAI_GROK_CLI_MODELS: ModelInfo[] = [
 	{
 		id: 'grok-build',
@@ -154,6 +168,27 @@ export function appendXaiGrokCliModels<T extends { models: ModelInfo[] }>(
 	return { ...entry, models: [...mergedModels, ...missingModels] };
 }
 
+export function appendOfficialKimiModels<T extends ProviderCatalogEntry>(
+	entry: T | undefined,
+): T | undefined {
+	if (!entry) return undefined;
+	const hasKimiK27Code = entry.models.some(
+		(model) => model.id === KIMI_K2_7_CODE_MODEL.id,
+	);
+	const env = Array.from(
+		new Set(['KIMI_API_KEY', 'MOONSHOT_API_KEY', ...(entry.env ?? [])]),
+	);
+	return {
+		...entry,
+		label: entry.label === 'Moonshot AI' ? 'Kimi' : entry.label,
+		env,
+		doc: 'https://platform.kimi.ai/docs/api/overview.md',
+		models: hasKimiK27Code
+			? entry.models
+			: [...entry.models, KIMI_K2_7_CODE_MODEL],
+	};
+}
+
 export function mergeManualCatalog(
 	base: CatalogMap,
 ): Record<BuiltInProviderId, ProviderCatalogEntry> {
@@ -167,6 +202,10 @@ export function mergeManualCatalog(
 	if (xaiEntry) {
 		merged.xai = xaiEntry;
 	}
+	const moonshotEntry = appendOfficialKimiModels(merged.moonshot);
+	if (moonshotEntry) {
+		merged.moonshot = moonshotEntry;
+	}
 	if (manualEntry) {
 		merged[OTTOROUTER_ID] = manualEntry;
 	}

package/src/providers/src/catalog.ts

@@ -2170,6 +2170,32 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 		openrouter: {
 			id: 'openrouter',
 			models: [
+				{
+					id: '~anthropic/claude-fable-latest',
+					ownedBy: 'anthropic',
+					label: 'Claude Fable Latest',
+					modalities: {
+						input: ['text', 'image', 'pdf'],
+						output: ['text'],
+					},
+					toolCall: true,
+					reasoningText: true,
+					attachment: true,
+					temperature: false,
+					releaseDate: '2026-06-09',
+					lastUpdated: '2026-06-09',
+					openWeights: false,
+					cost: {
+						input: 10,
+						output: 50,
+						cacheRead: 1,
+						cacheWrite: 12.5,
+					},
+					limit: {
+						context: 1000000,
+						output: 128000,
+					},
+				},
 				{
 					id: '~anthropic/claude-haiku-latest',
 					ownedBy: 'anthropic',
@@ -2317,13 +2343,13 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					lastUpdated: '2026-04-27',
 					openWeights: false,
 					cost: {
-						input: 0.68,
-						output: 3.41,
-						cacheRead: 0.34,
+						input: 0.67,
+						output: 3.39,
+						cacheRead: 0.14,
 					},
 					limit: {
-						context: 262142,
-						output: 262142,
+						context: 262144,
+						output: 262144,
 					},
 				},
 				{
@@ -2575,6 +2601,33 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 						output: 8192,
 					},
 				},
+				{
+					id: 'anthropic/claude-fable-5',
+					ownedBy: 'anthropic',
+					label: 'Claude Fable 5',
+					modalities: {
+						input: ['text', 'image', 'pdf'],
+						output: ['text'],
+					},
+					toolCall: true,
+					reasoningText: true,
+					attachment: true,
+					temperature: false,
+					knowledge: '2026-01-31',
+					releaseDate: '2026-06-09',
+					lastUpdated: '2026-06-09',
+					openWeights: false,
+					cost: {
+						input: 10,
+						output: 50,
+						cacheRead: 1,
+						cacheWrite: 12.5,
+					},
+					limit: {
+						context: 1000000,
+						output: 128000,
+					},
+				},
 				{
 					id: 'anthropic/claude-haiku-4.5',
 					ownedBy: 'anthropic',
@@ -3178,7 +3231,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 						cacheRead: 0.135,
 					},
 					limit: {
-						context: 163840,
+						context: 32768,
 						output: 16384,
 					},
 				},
@@ -3415,8 +3468,8 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					attachment: true,
 					temperature: true,
 					knowledge: '2025-01',
-					releaseDate: '2025-03-20',
-					lastUpdated: '2025-06-05',
+					releaseDate: '2025-06-17',
+					lastUpdated: '2025-06-17',
 					openWeights: false,
 					cost: {
 						input: 0.3,
@@ -3496,8 +3549,8 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					attachment: true,
 					temperature: true,
 					knowledge: '2025-01',
-					releaseDate: '2025-03-20',
-					lastUpdated: '2025-06-05',
+					releaseDate: '2025-06-17',
+					lastUpdated: '2025-06-17',
 					openWeights: false,
 					cost: {
 						input: 1.25,
@@ -3841,12 +3894,12 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					openWeights: true,
 					cost: {
 						input: 0.12,
-						output: 0.36,
+						output: 0.35,
 						cacheRead: 0.09,
 					},
 					limit: {
-						context: 256000,
-						output: 8192,
+						context: 262144,
+						output: 262144,
 					},
 				},
 				{
@@ -4253,7 +4306,8 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					openWeights: true,
 					cost: {
 						input: 0.15,
-						output: 1.15,
+						output: 0.9,
+						cacheRead: 0.05,
 					},
 					limit: {
 						context: 196608,
@@ -4276,12 +4330,13 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					lastUpdated: '2026-03-18',
 					openWeights: true,
 					cost: {
-						input: 0.279,
-						output: 1.2,
+						input: 0.25,
+						output: 1,
+						cacheRead: 0.05,
 					},
 					limit: {
 						context: 196608,
-						output: 196608,
+						output: 131072,
 					},
 				},
 				{
@@ -4844,34 +4899,9 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					lastUpdated: '2026-04-21',
 					openWeights: true,
 					cost: {
-						input: 0.68,
-						output: 3.41,
-						cacheRead: 0.34,
-					},
-					limit: {
-						context: 262142,
-						output: 262142,
-					},
-				},
-				{
-					id: 'moonshotai/kimi-k2.6:free',
-					ownedBy: 'moonshot',
-					label: 'Kimi K2.6 (free)',
-					modalities: {
-						input: ['text', 'image'],
-						output: ['text'],
-					},
-					toolCall: true,
-					reasoningText: true,
-					attachment: true,
-					temperature: false,
-					knowledge: '2025-01',
-					releaseDate: '2026-04-21',
-					lastUpdated: '2026-04-21',
-					openWeights: true,
-					cost: {
-						input: 0,
-						output: 0,
+						input: 0.67,
+						output: 3.39,
+						cacheRead: 0.14,
 					},
 					limit: {
 						context: 262144,
@@ -5109,29 +5139,6 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 						output: 128000,
 					},
 				},
-				{
-					id: 'nvidia/nemotron-nano-9b-v2',
-					label: 'Nemotron Nano 9B v2',
-					modalities: {
-						input: ['text'],
-						output: ['text'],
-					},
-					toolCall: true,
-					reasoningText: true,
-					attachment: false,
-					temperature: true,
-					releaseDate: '2025-08-18',
-					lastUpdated: '2025-08-18',
-					openWeights: true,
-					cost: {
-						input: 0.04,
-						output: 0.16,
-					},
-					limit: {
-						context: 131072,
-						output: 16384,
-					},
-				},
 				{
 					id: 'nvidia/nemotron-nano-9b-v2:free',
 					label: 'Nemotron Nano 9B V2 (free)',
@@ -7649,12 +7656,13 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					lastUpdated: '2026-04-17',
 					openWeights: true,
 					cost: {
-						input: 0.14,
+						input: 0.15,
 						output: 1,
+						cacheRead: 0.05,
 					},
 					limit: {
-						context: 262140,
-						output: 262140,
+						context: 262144,
+						output: 262144,
 					},
 				},
 				{
@@ -7772,10 +7780,10 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					lastUpdated: '2026-06-02',
 					openWeights: false,
 					cost: {
-						input: 0.4,
-						output: 1.6,
-						cacheRead: 0.08,
-						cacheWrite: 0.5,
+						input: 0.32,
+						output: 1.28,
+						cacheRead: 0.064,
+						cacheWrite: 0.4,
 					},
 					limit: {
 						context: 1000000,
@@ -8149,31 +8157,6 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 						output: 131072,
 					},
 				},
-				{
-					id: 'z-ai/glm-4-32b',
-					ownedBy: 'zai',
-					label: 'GLM 4 32B ',
-					modalities: {
-						input: ['text'],
-						output: ['text'],
-					},
-					toolCall: true,
-					reasoningText: false,
-					attachment: false,
-					temperature: true,
-					knowledge: '2024-06-30',
-					releaseDate: '2025-07-24',
-					lastUpdated: '2025-07-24',
-					openWeights: false,
-					cost: {
-						input: 0.1,
-						output: 0.1,
-					},
-					limit: {
-						context: 128000,
-						output: 128000,
-					},
-				},
 				{
 					id: 'z-ai/glm-4.5',
 					ownedBy: 'zai',
@@ -8226,31 +8209,6 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 						output: 131070,
 					},
 				},
-				{
-					id: 'z-ai/glm-4.5-air:free',
-					ownedBy: 'zai',
-					label: 'GLM 4.5 Air (free)',
-					modalities: {
-						input: ['text'],
-						output: ['text'],
-					},
-					toolCall: true,
-					reasoningText: true,
-					attachment: false,
-					temperature: true,
-					knowledge: '2025-04',
-					releaseDate: '2025-07-28',
-					lastUpdated: '2025-07-28',
-					openWeights: true,
-					cost: {
-						input: 0,
-						output: 0,
-					},
-					limit: {
-						context: 131072,
-						output: 96000,
-					},
-				},
 				{
 					id: 'z-ai/glm-4.5v',
 					ownedBy: 'zai',
@@ -8322,11 +8280,11 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					cost: {
 						input: 0.3,
 						output: 0.9,
-						cacheRead: 0.05,
+						cacheRead: 0.055,
 					},
 					limit: {
 						context: 131072,
-						output: 24000,
+						output: 32768,
 					},
 				},
 				{
@@ -8427,7 +8385,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 						cacheRead: 0.24,
 					},
 					limit: {
-						context: 202752,
+						context: 262144,
 						output: 131072,
 					},
 				},
@@ -8456,31 +8414,6 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 						output: 131072,
 					},
 				},
-				{
-					id: 'z-ai/glm-5v-turbo',
-					ownedBy: 'zai',
-					label: 'GLM-5V-Turbo',
-					modalities: {
-						input: ['image', 'text', 'video'],
-						output: ['text'],
-					},
-					toolCall: true,
-					reasoningText: true,
-					attachment: true,
-					temperature: true,
-					releaseDate: '2026-04-01',
-					lastUpdated: '2026-04-01',
-					openWeights: false,
-					cost: {
-						input: 1.2,
-						output: 4,
-						cacheRead: 0.24,
-					},
-					limit: {
-						context: 202752,
-						output: 131072,
-					},
-				},
 			],
 			label: 'OpenRouter',
 			env: ['OPENROUTER_API_KEY'],
@@ -8547,6 +8480,36 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 						npm: '@ai-sdk/anthropic',
 					},
 				},
+				{
+					id: 'claude-fable-5',
+					ownedBy: 'anthropic',
+					label: 'Claude Fable 5',
+					modalities: {
+						input: ['text', 'image', 'pdf'],
+						output: ['text'],
+					},
+					toolCall: true,
+					reasoningText: true,
+					attachment: true,
+					temperature: false,
+					knowledge: '2026-01-31',
+					releaseDate: '2026-06-09',
+					lastUpdated: '2026-06-09',
+					openWeights: false,
+					cost: {
+						input: 10,
+						output: 50,
+						cacheRead: 1,
+						cacheWrite: 12.5,
+					},
+					limit: {
+						context: 1000000,
+						output: 128000,
+					},
+					provider: {
+						npm: '@ai-sdk/anthropic',
+					},
+				},
 				{
 					id: 'claude-haiku-4-5',
 					ownedBy: 'anthropic',
@@ -8834,7 +8797,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					cost: {
 						input: 0.14,
 						output: 0.28,
-						cacheRead: 0.03,
+						cacheRead: 0.028,
 					},
 					limit: {
 						context: 1000000,
@@ -8866,6 +8829,31 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 						output: 128000,
 					},
 				},
+				{
+					id: 'deepseek-v4-pro',
+					label: 'DeepSeek V4 Pro',
+					modalities: {
+						input: ['text'],
+						output: ['text'],
+					},
+					toolCall: true,
+					reasoningText: true,
+					attachment: false,
+					temperature: true,
+					knowledge: '2025-05',
+					releaseDate: '2026-04-24',
+					lastUpdated: '2026-04-24',
+					openWeights: true,
+					cost: {
+						input: 1.74,
+						output: 3.84,
+						cacheRead: 0.145,
+					},
+					limit: {
+						context: 1000000,
+						output: 384000,
+					},
+				},
 				{
 					id: 'gemini-3-flash',
 					ownedBy: 'google',
@@ -11154,12 +11142,38 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 						output: 262144,
 					},
 				},
+				{
+					id: 'kimi-k2.7-code',
+					ownedBy: 'moonshot',
+					label: 'Kimi K2.7 Code',
+					modalities: {
+						input: ['text', 'image', 'video'],
+						output: ['text'],
+					},
+					toolCall: true,
+					reasoningText: true,
+					attachment: true,
+					temperature: false,
+					knowledge: '2025-01',
+					releaseDate: '2026-06-12',
+					lastUpdated: '2026-06-12',
+					openWeights: true,
+					cost: {
+						input: 0.95,
+						output: 4,
+						cacheRead: 0.19,
+					},
+					limit: {
+						context: 262144,
+						output: 262144,
+					},
+				},
 			],
-			label: 'Moonshot AI',
-			env: ['MOONSHOT_API_KEY'],
+			label: 'Kimi',
+			env: ['KIMI_API_KEY', 'MOONSHOT_API_KEY'],
 			npm: '@ai-sdk/openai-compatible',
 			api: 'https://api.moonshot.ai/v1',
-			doc: 'https://platform.moonshot.ai/docs/api/chat',
+			doc: 'https://platform.kimi.ai/docs/api/overview.md',
 		},
 		minimax: {
 			id: 'minimax',
@@ -11351,6 +11365,33 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 		copilot: {
 			id: 'copilot',
 			models: [
+				{
+					id: 'claude-fable-5',
+					ownedBy: 'anthropic',
+					label: 'Claude Fable 5',
+					modalities: {
+						input: ['text', 'image', 'pdf'],
+						output: ['text'],
+					},
+					toolCall: true,
+					reasoningText: true,
+					attachment: true,
+					temperature: false,
+					knowledge: '2026-01-31',
+					releaseDate: '2026-06-09',
+					lastUpdated: '2026-06-09',
+					openWeights: false,
+					cost: {
+						input: 10,
+						output: 50,
+						cacheRead: 1,
+						cacheWrite: 12.5,
+					},
+					limit: {
+						context: 1000000,
+						output: 128000,
+					},
+				},
 				{
 					id: 'claude-haiku-4.5',
 					ownedBy: 'anthropic',
@@ -11579,8 +11620,8 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					attachment: true,
 					temperature: true,
 					knowledge: '2025-01',
-					releaseDate: '2025-03-20',
-					lastUpdated: '2025-06-05',
+					releaseDate: '2025-06-17',
+					lastUpdated: '2025-06-17',
 					openWeights: false,
 					cost: {
 						input: 1.25,

package/src/providers/src/env.ts

@@ -1,4 +1,5 @@
 import type { BuiltInProviderId, ProviderId } from '../../types/src/index.ts';
+import { readKimiApiKeyFromEnv } from './moonshot-client.ts';
 
 const ENV_VARS: Record<BuiltInProviderId, string> = {
 	openai: 'OPENAI_API_KEY',
@@ -12,15 +13,22 @@ const ENV_VARS: Record<BuiltInProviderId, string> = {
 	xai: 'XAI_API_KEY',
 	zai: 'ZAI_API_KEY',
 	'zai-coding': 'ZAI_CODING_API_KEY',
-	moonshot: 'MOONSHOT_API_KEY',
+	moonshot: 'KIMI_API_KEY',
 	minimax: 'MINIMAX_API_KEY',
 };
 
+const KIMI_PROVIDER_IDS = new Set<ProviderId>(['kimi', 'moonshot']);
+
 export function providerEnvVar(provider: ProviderId): string | undefined {
+	if (provider === 'kimi') return 'KIMI_API_KEY';
 	return ENV_VARS[provider as BuiltInProviderId];
 }
 
 export function readEnvKey(provider: ProviderId): string | undefined {
+	if (KIMI_PROVIDER_IDS.has(provider)) {
+		const value = readKimiApiKeyFromEnv();
+		return value.length ? value : undefined;
+	}
 	if (!(provider in ENV_VARS) && provider !== 'copilot') {
 		return undefined;
 	}
@@ -39,8 +47,13 @@ export function readEnvKey(provider: ProviderId): string | undefined {
 }
 
 export function setEnvKey(provider: ProviderId, value: string | undefined) {
+	if (!value) return;
+	if (KIMI_PROVIDER_IDS.has(provider)) {
+		process.env.KIMI_API_KEY = value;
+		return;
+	}
 	const key = providerEnvVar(provider);
-	if (key && value) {
+	if (key) {
 		process.env[key] = value;
 	}
 }

package/src/providers/src/index.ts

@@ -123,8 +123,15 @@ export {
 export type { OpenRouterProviderConfig } from './openrouter-client.ts';
 export { createOpencodeModel } from './opencode-client.ts';
 export type { OpencodeProviderConfig } from './opencode-client.ts';
-export { createMoonshotModel } from './moonshot-client.ts';
-export type { MoonshotProviderConfig } from './moonshot-client.ts';
+export {
+	createKimiModel,
+	createMoonshotModel,
+	readKimiApiKeyFromEnv,
+} from './moonshot-client.ts';
+export type {
+	KimiProviderConfig,
+	MoonshotProviderConfig,
+} from './moonshot-client.ts';
 export { createMinimaxModel } from './minimax-client.ts';
 export type { MinimaxProviderConfig } from './minimax-client.ts';
 export { createCopilotFetch, createCopilotModel } from './copilot-client.ts';

package/src/providers/src/model-merge.ts

@@ -0,0 +1,27 @@
+import type { ModelInfo } from '../../types/src/index.ts';
+
+/**
+ * Merge embedded/manual catalog models with cached (remote/local) models by id.
+ *
+ * Cached entries override fields for overlapping ids (so remote updates like
+ * pricing/limits still apply), while embedded/manual-only models (for example
+ * `kimi-k2.7-code` or the manual xai grok-cli models) are always retained even
+ * when a stale cache does not include them.
+ */
+export function mergeModelLists(
+	baseModels: ModelInfo[] | undefined,
+	cachedModels: ModelInfo[] | undefined,
+): ModelInfo[] {
+	const base = baseModels ?? [];
+	const cached = cachedModels ?? [];
+	if (!cached.length) return base;
+	if (!base.length) return cached;
+	const cachedById = new Map(cached.map((model) => [model.id, model]));
+	const merged = base.map((model) => {
+		const override = cachedById.get(model.id);
+		return override ? { ...model, ...override } : model;
+	});
+	const baseIds = new Set(base.map((model) => model.id));
+	const extras = cached.filter((model) => !baseIds.has(model.id));
+	return extras.length ? [...merged, ...extras] : merged;
+}

package/src/providers/src/moonshot-client.ts

@@ -1,25 +1,48 @@
 import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
+import type { OAuth } from '../../types/src/index.ts';
 import { catalog } from './catalog-merged.ts';
 
-export type MoonshotProviderConfig = {
+export type KimiProviderConfig = {
 	apiKey?: string;
 	baseURL?: string;
+	oauth?: OAuth;
 };
 
-export function createMoonshotModel(
-	model: string,
-	config?: MoonshotProviderConfig,
-) {
+/** @deprecated Use `KimiProviderConfig` */
+export type MoonshotProviderConfig = KimiProviderConfig;
+
+export function readKimiApiKeyFromEnv(): string {
+	return process.env.KIMI_API_KEY || process.env.MOONSHOT_API_KEY || '';
+}
+
+export function createKimiModel(model: string, config?: KimiProviderConfig) {
 	const entry = catalog.moonshot;
-	const baseURL = config?.baseURL || entry?.api || 'https://api.moonshot.ai/v1';
-	const apiKey = config?.apiKey || process.env.MOONSHOT_API_KEY || '';
+	const oauthAccess = config?.oauth?.access;
+	const defaultApiBaseURL = entry?.api ?? 'https://api.moonshot.ai/v1';
+	const configuredBaseURL = config?.baseURL;
+	const kimiCodeBaseURL =
+		process.env.KIMI_CODE_BASE_URL ?? 'https://api.kimi.com/coding/v1';
+	const baseURL =
+		oauthAccess &&
+		(!configuredBaseURL || configuredBaseURL === defaultApiBaseURL)
+			? kimiCodeBaseURL
+			: (configuredBaseURL ?? defaultApiBaseURL);
+	const apiKey = oauthAccess || config?.apiKey || readKimiApiKeyFromEnv();
 	const headers = apiKey ? { Authorization: `Bearer ${apiKey}` } : undefined;
 
 	const instance = createOpenAICompatible({
-		name: entry?.label ?? 'Moonshot AI',
+		name: 'Kimi',
 		baseURL,
 		headers,
 	});
 
 	return instance(model);
 }
+
+/** @deprecated Use `createKimiModel` */
+export function createMoonshotModel(
+	model: string,
+	config?: MoonshotProviderConfig,
+) {
+	return createKimiModel(model, config);
+}

package/src/providers/src/registry.ts

@@ -1,6 +1,7 @@
 import { catalog } from './catalog-merged.ts';
-import { providerEnvVar } from './env.ts';
+import { providerEnvVar, readEnvKey } from './env.ts';
 import { getCachedProviderCatalogEntry } from './model-catalog-cache.ts';
+import { mergeModelLists } from './model-merge.ts';
 import { getUnderlyingProviderKey, providerIds } from './utils.ts';
 import type {
 	BuiltInProviderId,
@@ -94,7 +95,9 @@ function resolveCustomFamily(
 	return settings.family ?? 'default';
 }
 
-export function isBuiltInProviderId(
+export const KIMI_PROVIDER_ALIAS = 'kimi' as const;
+
+function isCatalogBuiltInProviderId(
 	value: unknown,
 ): value is BuiltInProviderId {
 	return (
@@ -103,6 +106,20 @@ export function isBuiltInProviderId(
 	);
 }
 
+export function resolveBuiltInProviderCatalogId(
+	provider: ProviderId,
+): BuiltInProviderId | undefined {
+	if (provider === KIMI_PROVIDER_ALIAS) return 'moonshot';
+	if (isCatalogBuiltInProviderId(provider)) return provider;
+	return undefined;
+}
+
+export function isBuiltInProviderId(
+	value: unknown,
+): value is BuiltInProviderId {
+	return isCatalogBuiltInProviderId(value) || value === KIMI_PROVIDER_ALIAS;
+}
+
 export function getProviderSettings(
 	cfg: OttoConfig,
 	provider: ProviderId,
@@ -115,23 +132,37 @@ export function getProviderDefinition(
 	provider: ProviderId,
 ): ResolvedProviderDefinition | undefined {
 	const settings = getProviderSettings(cfg, provider);
-	if (isBuiltInProviderId(provider)) {
-		const entry = catalog[provider];
+	const catalogProvider = resolveBuiltInProviderCatalogId(provider);
+	if (catalogProvider) {
+		const entry = catalog[catalogProvider];
 		if (!entry) return undefined;
-		const cachedEntry = getCachedProviderCatalogEntry(provider);
-		const models = cachedEntry?.models ?? entry.models;
+		const cachedEntry = getCachedProviderCatalogEntry(catalogProvider);
+		const models = mergeModelLists(entry.models, cachedEntry?.models);
+		const moonshotSettings =
+			provider === KIMI_PROVIDER_ALIAS
+				? (getProviderSettings(cfg, 'moonshot') ?? settings)
+				: settings;
+		const resolvedSettings =
+			provider === KIMI_PROVIDER_ALIAS
+				? (settings ?? moonshotSettings)
+				: settings;
 		return {
 			id: provider,
-			label: settings?.label ?? cachedEntry?.label ?? entry.label ?? provider,
+			label:
+				resolvedSettings?.label ??
+				(provider === KIMI_PROVIDER_ALIAS
+					? 'Kimi'
+					: (cachedEntry?.label ?? entry.label ?? provider)),
 			source: 'built-in',
-			compatibility: BUILTIN_COMPATIBILITY[provider],
-			family: BUILTIN_FAMILY[provider],
-			baseURL: normalizeOptionalText(settings?.baseURL) ?? entry.api,
-			apiKey: normalizeOptionalText(settings?.apiKey),
+			compatibility: BUILTIN_COMPATIBILITY[catalogProvider],
+			family: BUILTIN_FAMILY[catalogProvider],
+			baseURL: normalizeOptionalText(resolvedSettings?.baseURL) ?? entry.api,
+			apiKey: normalizeOptionalText(resolvedSettings?.apiKey),
 			apiKeyEnv:
-				normalizeOptionalText(settings?.apiKeyEnv) ?? providerEnvVar(provider),
+				normalizeOptionalText(resolvedSettings?.apiKeyEnv) ??
+				providerEnvVar(provider),
 			models,
-			allowAnyModel: provider === 'ollama-cloud',
+			allowAnyModel: catalogProvider === 'ollama-cloud',
 		};
 	}
 
@@ -171,6 +202,7 @@ export function getConfiguredProviderIds(
 	const includeDisabled = options?.includeDisabled === true;
 	const ids = new Set<ProviderId>([
 		...providerIds,
+		KIMI_PROVIDER_ALIAS,
 		...Object.keys(cfg.providers),
 		cfg.defaults.provider,
 	]);
@@ -224,8 +256,11 @@ export function getConfiguredProviderFamily(
 	const definition = getProviderDefinition(cfg, provider);
 	if (!definition) return null;
 	if (definition.source === 'custom') return definition.family;
-	if (isBuiltInProviderId(provider)) {
-		return getUnderlyingProviderKey(provider, model) ?? definition.family;
+	const catalogProvider = resolveBuiltInProviderCatalogId(provider);
+	if (catalogProvider) {
+		return (
+			getUnderlyingProviderKey(catalogProvider, model) ?? definition.family
+		);
 	}
 	return definition.family;
 }
@@ -245,6 +280,10 @@ export function getConfiguredProviderApiKey(
 	const definition = getProviderDefinition(cfg, provider);
 	if (!definition) return undefined;
 	if (definition.apiKey?.length) return definition.apiKey;
+	if (provider === KIMI_PROVIDER_ALIAS || provider === 'moonshot') {
+		const envValue = readEnvKey(provider);
+		if (envValue?.length) return envValue;
+	}
 	if (definition.apiKeyEnv?.length) {
 		const value = process.env[definition.apiKeyEnv];
 		if (value?.length) return value;

package/src/providers/src/utils.ts

@@ -1,5 +1,6 @@
 import { catalog } from './catalog-merged.ts';
 import { getCachedProviderCatalogEntry } from './model-catalog-cache.ts';
+import { mergeModelLists } from './model-merge.ts';
 import type {
 	BuiltInProviderId,
 	ProviderId,
@@ -7,7 +8,7 @@ import type {
 	ModelOwner,
 } from '../../types/src/index.ts';
 import { filterModelsForAuthType } from './oauth-models.ts';
-import { isBuiltInProviderId } from './registry.ts';
+import { resolveBuiltInProviderCatalogId } from './registry.ts';
 
 export const providerIds = Object.keys(catalog) as BuiltInProviderId[];
 
@@ -108,7 +109,8 @@ export function getModelNpmBinding(
 	provider: ProviderId,
 	model: string,
 ): string | undefined {
-	const entry = isBuiltInProviderId(provider) ? catalog[provider] : undefined;
+	const catalogProvider = resolveBuiltInProviderCatalogId(provider);
+	const entry = catalogProvider ? catalog[catalogProvider] : undefined;
 	const modelInfo = getProviderModels(provider).find((m) => m.id === model);
 	if (modelInfo?.provider?.npm) return modelInfo.provider.npm;
 	if (entry?.npm) return entry.npm;
@@ -240,17 +242,21 @@ export function getModelInfo(
 	provider: ProviderId,
 	model: string,
 ): ModelInfo | undefined {
-	const entry = isBuiltInProviderId(provider) ? catalog[provider] : undefined;
+	const catalogProvider = resolveBuiltInProviderCatalogId(provider);
+	const entry = catalogProvider ? catalog[catalogProvider] : undefined;
 	if (!entry) return undefined;
 	return getProviderModels(provider).find((m) => m.id === model);
 }
 
 function getProviderModels(provider: ProviderId): ModelInfo[] {
-	return (
-		getCachedProviderCatalogEntry(provider)?.models ??
-		(isBuiltInProviderId(provider) ? catalog[provider]?.models : undefined) ??
-		[]
-	);
+	const catalogProvider = resolveBuiltInProviderCatalogId(provider);
+	const catalogModels = catalogProvider
+		? catalog[catalogProvider]?.models
+		: undefined;
+	const cachedModels = getCachedProviderCatalogEntry(
+		catalogProvider ?? provider,
+	)?.models;
+	return mergeModelLists(catalogModels, cachedModels);
 }
 
 export function modelSupportsReasoning(

package/src/providers/src/validate.ts

@@ -1,11 +1,12 @@
 import { catalog } from './catalog-merged.ts';
 import { getCachedProviderCatalogEntry } from './model-catalog-cache.ts';
+import { mergeModelLists } from './model-merge.ts';
 import type { OttoConfig, ProviderId } from '../../types/src/index.ts';
 import {
 	getProviderDefinition,
 	hasConfiguredModel,
-	isBuiltInProviderId,
 	providerAllowsAnyModel,
+	resolveBuiltInProviderCatalogId,
 } from './registry.ts';
 
 export type CapabilityRequest = {
@@ -28,7 +29,9 @@ export function validateProviderModel(
 	if (cfg) {
 		const definition = getProviderDefinition(cfg, providerId);
 		const cachedModels =
-			getCachedProviderCatalogEntry(providerId)?.models ?? [];
+			getCachedProviderCatalogEntry(
+				resolveBuiltInProviderCatalogId(providerId) ?? providerId,
+			)?.models ?? [];
 		if (!definition) {
 			if (!cachedModels.length) {
 				throw new Error(`Provider not supported: ${providerId}`);
@@ -69,12 +72,13 @@ export function validateProviderModel(
 	}
 
 	const p = providerId;
-	const builtInEntry = isBuiltInProviderId(p) ? catalog[p] : undefined;
-	if (!builtInEntry && !getCachedProviderCatalogEntry(p)) {
+	const catalogProvider = resolveBuiltInProviderCatalogId(p);
+	const builtInEntry = catalogProvider ? catalog[catalogProvider] : undefined;
+	const cachedEntry = getCachedProviderCatalogEntry(catalogProvider ?? p);
+	if (!builtInEntry && !cachedEntry) {
 		throw new Error(`Provider not supported: ${providerId}`);
 	}
-	const models =
-		getCachedProviderCatalogEntry(p)?.models ?? builtInEntry?.models ?? [];
+	const models = mergeModelLists(builtInEntry?.models, cachedEntry?.models);
 	const entry = models.find((m: { id: string }) => m.id === modelId);
 	if (!entry) {
 		throwModelNotFound(providerId, modelId, models);