@ottocode/sdk 0.1.311 → 0.1.313

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',
@@ -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',
@@ -3345,12 +3398,12 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					lastUpdated: '2026-04-24',
 					openWeights: true,
 					cost: {
-						input: 0.0983,
-						output: 0.1966,
-						cacheRead: 0.0197,
+						input: 0.098,
+						output: 0.196,
+						cacheRead: 0.02,
 					},
 					limit: {
-						context: 1048576,
+						context: 1048575,
 						output: 131072,
 					},
 				},
@@ -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,
 					},
 				},
 				{
@@ -4818,12 +4873,11 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					lastUpdated: '2026-01',
 					openWeights: true,
 					cost: {
-						input: 0.4,
-						output: 1.9,
-						cacheRead: 0.09,
+						input: 0.375,
+						output: 2.025,
 					},
 					limit: {
-						context: 262144,
+						context: 256000,
 						output: 262144,
 					},
 				},
@@ -4854,9 +4908,9 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					},
 				},
 				{
-					id: 'moonshotai/kimi-k2.6:free',
+					id: 'moonshotai/kimi-k2.7-code',
 					ownedBy: 'moonshot',
-					label: 'Kimi K2.6 (free)',
+					label: 'Kimi K2.7 Code',
 					modalities: {
 						input: ['text', 'image'],
 						output: ['text'],
@@ -4864,14 +4918,15 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					toolCall: true,
 					reasoningText: true,
 					attachment: true,
-					temperature: false,
+					temperature: true,
 					knowledge: '2025-01',
-					releaseDate: '2026-04-21',
-					lastUpdated: '2026-04-21',
+					releaseDate: '2026-06-12',
+					lastUpdated: '2026-06-12',
 					openWeights: true,
 					cost: {
-						input: 0,
-						output: 0,
+						input: 0.75,
+						output: 3.5,
+						cacheRead: 0.16,
 					},
 					limit: {
 						context: 262144,
@@ -5109,29 +5164,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)',
@@ -7626,12 +7658,12 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					lastUpdated: '2026-04-22',
 					openWeights: true,
 					cost: {
-						input: 0.289,
-						output: 2.4,
+						input: 0.2885,
+						output: 3.17,
 					},
 					limit: {
-						context: 131072,
-						output: 131072,
+						context: 262140,
+						output: 262140,
 					},
 				},
 				{
@@ -7649,12 +7681,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 +7805,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 +8182,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 +8234,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 +8305,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 +8410,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 						cacheRead: 0.24,
 					},
 					limit: {
-						context: 202752,
+						context: 262144,
 						output: 131072,
 					},
 				},
@@ -8456,31 +8439,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 +8505,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 +8822,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 +8854,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',
@@ -10936,6 +10949,32 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 						output: 131072,
 					},
 				},
+				{
+					id: 'glm-5.2',
+					ownedBy: 'zai',
+					label: 'GLM-5.2',
+					modalities: {
+						input: ['text'],
+						output: ['text'],
+					},
+					toolCall: true,
+					reasoningText: true,
+					attachment: false,
+					temperature: true,
+					releaseDate: '2026-06-13',
+					lastUpdated: '2026-06-13',
+					openWeights: false,
+					cost: {
+						input: 0,
+						output: 0,
+						cacheRead: 0,
+						cacheWrite: 0,
+					},
+					limit: {
+						context: 1000000,
+						output: 131072,
+					},
+				},
 				{
 					id: 'glm-5v-turbo',
 					ownedBy: 'zai',
@@ -11154,12 +11193,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 +11416,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 +11671,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,
@@ -12297,6 +12389,27 @@ 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'],
+						output: ['text'],
+					},
+					toolCall: true,
+					reasoningText: true,
+					attachment: true,
+					temperature: false,
+					knowledge: '2025-01',
+					releaseDate: '2026-06-12',
+					lastUpdated: '2026-06-12',
+					openWeights: true,
+					limit: {
+						context: 262144,
+						output: 262144,
+					},
+				},
 				{
 					id: 'minimax-m2',
 					ownedBy: 'minimax',

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
+ * 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;
+}