@ottocode/sdk 0.1.312 → 0.1.313

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ottocode/sdk",
-	"version": "0.1.312",
+	"version": "0.1.313",
 	"description": "AI agent SDK for building intelligent assistants - tree-shakable and comprehensive",
 	"author": "nitishxyz",
 	"license": "MIT",

package/src/config/src/index.ts

@@ -51,6 +51,12 @@ const DEFAULTS: {
 	providers: DEFAULT_PROVIDER_SETTINGS,
 };
 
+const LOCAL_DEFAULT_OVERRIDE_KEYS = [
+	'agent',
+	'provider',
+	'model',
+] satisfies Array<keyof OttoConfig['defaults']>;
+
 export async function loadConfig(
 	projectRootInput?: string,
 ): Promise<OttoConfig> {
@@ -72,7 +78,7 @@ export async function loadConfig(
 		DEFAULTS,
 		globalCfg,
 		globalSkillsCfg ? { skills: globalSkillsCfg } : undefined,
-		omitGlobalOnlySettings(projectCfg),
+		filterProjectConfig(projectCfg),
 	);
 
 	await ensureDir(dataDir);
@@ -97,14 +103,32 @@ export async function loadConfig(
 
 type JsonObject = Record<string, unknown>;
 
-function omitGlobalOnlySettings(
+function filterProjectConfig(
 	config: JsonObject | undefined,
 ): JsonObject | undefined {
 	if (!config) return undefined;
-	const { providers: _providers, skills: _skills, ...rest } = config;
+	const { providers: _providers, skills: _skills, defaults, ...rest } = config;
+	const localDefaults = pickLocalDefaults(defaults);
+	if (localDefaults) {
+		return { ...rest, defaults: localDefaults };
+	}
 	return rest;
 }
 
+function pickLocalDefaults(defaults: unknown): JsonObject | undefined {
+	if (!defaults || typeof defaults !== 'object' || Array.isArray(defaults)) {
+		return undefined;
+	}
+	const source = defaults as JsonObject;
+	const picked: JsonObject = {};
+	for (const key of LOCAL_DEFAULT_OVERRIDE_KEYS) {
+		if (Object.hasOwn(source, key)) {
+			picked[key] = source[key];
+		}
+	}
+	return Object.keys(picked).length > 0 ? picked : undefined;
+}
+
 async function readJsonOptional(file: string): Promise<JsonObject | undefined> {
 	const f = Bun.file(file);
 	if (!(await f.exists())) return undefined;

package/src/config/src/manager.ts

@@ -28,6 +28,8 @@ import {
 
 export type Scope = 'global' | 'local';
 
+const LOCAL_DEFAULT_UPDATE_KEYS = new Set(['agent', 'provider', 'model']);
+
 export type DebugConfig = {
 	enabled: boolean;
 	scopes: string[];
@@ -95,6 +97,16 @@ export async function writeDefaults(
 	}>,
 	projectRoot?: string,
 ) {
+	const scopedUpdates =
+		scope === 'local'
+			? (Object.fromEntries(
+					Object.entries(updates).filter(([key]) =>
+						LOCAL_DEFAULT_UPDATE_KEYS.has(key),
+					),
+				) as typeof updates)
+			: updates;
+	if (Object.keys(scopedUpdates).length === 0) return;
+
 	const filePath = getConfigFilePath(scope, projectRoot);
 	const existing = await readJsonFile(filePath);
 	const prevDefaults =
@@ -103,7 +115,7 @@ export async function writeDefaults(
 			: {};
 	const next = {
 		...existing,
-		defaults: { ...prevDefaults, ...updates },
+		defaults: { ...prevDefaults, ...scopedUpdates },
 	};
 	await writeConfigFile(filePath, next);
 }

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

@@ -14,20 +14,6 @@ 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',
@@ -168,13 +154,10 @@ export function appendXaiGrokCliModels<T extends { models: ModelInfo[] }>(
 	return { ...entry, models: [...mergedModels, ...missingModels] };
 }
 
-export function appendOfficialKimiModels<T extends ProviderCatalogEntry>(
-	entry: T | undefined,
-): T | undefined {
+export function applyOfficialKimiCatalogMetadata<
+	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 ?? [])]),
 	);
@@ -183,9 +166,6 @@ export function appendOfficialKimiModels<T extends ProviderCatalogEntry>(
 		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],
 	};
 }
 
@@ -202,7 +182,7 @@ export function mergeManualCatalog(
 	if (xaiEntry) {
 		merged.xai = xaiEntry;
 	}
-	const moonshotEntry = appendOfficialKimiModels(merged.moonshot);
+	const moonshotEntry = applyOfficialKimiCatalogMetadata(merged.moonshot);
 	if (moonshotEntry) {
 		merged.moonshot = moonshotEntry;
 	}

package/src/providers/src/catalog.ts

@@ -2343,13 +2343,13 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					lastUpdated: '2026-04-27',
 					openWeights: false,
 					cost: {
-						input: 0.67,
-						output: 3.39,
-						cacheRead: 0.14,
+						input: 0.68,
+						output: 3.41,
+						cacheRead: 0.34,
 					},
 					limit: {
-						context: 262144,
-						output: 262144,
+						context: 262142,
+						output: 262142,
 					},
 				},
 				{
@@ -3231,7 +3231,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 						cacheRead: 0.135,
 					},
 					limit: {
-						context: 32768,
+						context: 163840,
 						output: 16384,
 					},
 				},
@@ -3398,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,
 					},
 				},
@@ -4873,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,
 					},
 				},
@@ -4899,9 +4898,35 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					lastUpdated: '2026-04-21',
 					openWeights: true,
 					cost: {
-						input: 0.67,
-						output: 3.39,
-						cacheRead: 0.14,
+						input: 0.68,
+						output: 3.41,
+						cacheRead: 0.34,
+					},
+					limit: {
+						context: 262142,
+						output: 262142,
+					},
+				},
+				{
+					id: 'moonshotai/kimi-k2.7-code',
+					ownedBy: 'moonshot',
+					label: 'Kimi K2.7 Code',
+					modalities: {
+						input: ['text', 'image'],
+						output: ['text'],
+					},
+					toolCall: true,
+					reasoningText: true,
+					attachment: true,
+					temperature: true,
+					knowledge: '2025-01',
+					releaseDate: '2026-06-12',
+					lastUpdated: '2026-06-12',
+					openWeights: true,
+					cost: {
+						input: 0.75,
+						output: 3.5,
+						cacheRead: 0.16,
 					},
 					limit: {
 						context: 262144,
@@ -7633,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,
 					},
 				},
 				{
@@ -10924,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',
@@ -12338,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/model-merge.ts

@@ -5,8 +5,8 @@ import type { ModelInfo } from '../../types/src/index.ts';
  *
  * 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.
+ * the manual xai grok-cli models) are always retained even when a stale cache
+ * does not include them.
  */
 export function mergeModelLists(
 	baseModels: ModelInfo[] | undefined,

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

@@ -15,6 +15,90 @@ export function readKimiApiKeyFromEnv(): string {
 	return process.env.KIMI_API_KEY || process.env.MOONSHOT_API_KEY || '';
 }
 
+/**
+ * Kimi/Moonshot streaming responses report token usage on the final chunk's
+ * `choices[0].usage` instead of the OpenAI-standard top-level `usage` field.
+ * The AI SDK openai-compatible parser only reads top-level `usage`, so we
+ * hoist choice-level usage to the top level when it is missing.
+ */
+export function hoistKimiSseUsage(line: string): string {
+	const hasCarriageReturn = line.endsWith('\r');
+	const raw = hasCarriageReturn ? line.slice(0, -1) : line;
+	if (!raw.startsWith('data:')) return line;
+	const payload = raw.slice(5).trim();
+	if (!payload || payload === '[DONE]') return line;
+	try {
+		const parsed = JSON.parse(payload) as {
+			usage?: unknown;
+			choices?: Array<{ usage?: unknown } | null>;
+		};
+		if (!parsed || typeof parsed !== 'object' || parsed.usage != null) {
+			return line;
+		}
+		const choiceUsage = Array.isArray(parsed.choices)
+			? parsed.choices.find((choice) => choice?.usage != null)?.usage
+			: undefined;
+		if (choiceUsage == null) return line;
+		parsed.usage = choiceUsage;
+		return `data: ${JSON.stringify(parsed)}${hasCarriageReturn ? '\r' : ''}`;
+	} catch {
+		return line;
+	}
+}
+
+/**
+ * Wraps fetch so Kimi SSE chunks carrying `choices[0].usage` are rewritten to
+ * expose a top-level `usage` field the AI SDK can parse.
+ */
+export function createKimiUsageFetch(
+	baseFetch: typeof fetch = fetch,
+): typeof fetch {
+	const wrappedFetch = async (
+		input: Parameters<typeof fetch>[0],
+		init?: Parameters<typeof fetch>[1],
+	): Promise<Response> => {
+		const response = await baseFetch(input, init);
+		const contentType = response.headers.get('content-type') ?? '';
+		if (
+			!response.ok ||
+			!response.body ||
+			!contentType.includes('text/event-stream')
+		) {
+			return response;
+		}
+
+		const decoder = new TextDecoder();
+		const encoder = new TextEncoder();
+		let buffered = '';
+		const transform = new TransformStream<Uint8Array, Uint8Array>({
+			transform(chunk, controller) {
+				buffered += decoder.decode(chunk, { stream: true });
+				const lines = buffered.split('\n');
+				buffered = lines.pop() ?? '';
+				for (const line of lines) {
+					controller.enqueue(encoder.encode(`${hoistKimiSseUsage(line)}\n`));
+				}
+			},
+			flush(controller) {
+				buffered += decoder.decode();
+				if (buffered.length) {
+					controller.enqueue(encoder.encode(hoistKimiSseUsage(buffered)));
+				}
+			},
+		});
+
+		const headers = new Headers(response.headers);
+		headers.delete('content-length');
+		headers.delete('content-encoding');
+		return new Response(response.body.pipeThrough(transform), {
+			status: response.status,
+			statusText: response.statusText,
+			headers,
+		});
+	};
+	return wrappedFetch as typeof fetch;
+}
+
 export function createKimiModel(model: string, config?: KimiProviderConfig) {
 	const entry = catalog.moonshot;
 	const oauthAccess = config?.oauth?.access;
@@ -34,6 +118,7 @@ export function createKimiModel(model: string, config?: KimiProviderConfig) {
 		name: 'Kimi',
 		baseURL,
 		headers,
+		fetch: createKimiUsageFetch(),
 	});
 
 	return instance(model);

package/src/providers/src/utils.ts

@@ -45,18 +45,25 @@ const PREFERRED_FAST_MODELS: Partial<Record<ProviderId, string[]>> = {
 	xai: ['grok-code-fast-1', 'grok-4-fast'],
 	zai: ['glm-4.5-flash'],
 	copilot: ['gpt-4.1-mini'],
+	moonshot: ['kimi-k2-turbo-preview'],
 };
 
 const PREFERRED_FAST_MODELS_OAUTH: Partial<Record<ProviderId, string[]>> = {
 	openai: ['gpt-5.4-mini'],
 	anthropic: ['claude-haiku-4-5'],
+	moonshot: ['kimi-k2.7-code'],
 };
 
+function preferredFastModelKey(provider: ProviderId): ProviderId {
+	return resolveBuiltInProviderCatalogId(provider) ?? provider;
+}
+
 export function getFastModel(provider: ProviderId): string | undefined {
 	const providerModels = getProviderModels(provider);
 	if (!providerModels.length) return undefined;
 
-	const preferred = PREFERRED_FAST_MODELS[provider] ?? [];
+	const preferred =
+		PREFERRED_FAST_MODELS[preferredFastModelKey(provider)] ?? [];
 	for (const modelId of preferred) {
 		if (providerModels.some((m) => m.id === modelId)) {
 			return modelId;
@@ -86,7 +93,7 @@ export function getFastModelForAuth(
 
 	const preferredMap =
 		authType === 'oauth' ? PREFERRED_FAST_MODELS_OAUTH : PREFERRED_FAST_MODELS;
-	const preferred = preferredMap[provider] ?? [];
+	const preferred = preferredMap[preferredFastModelKey(provider)] ?? [];
 	for (const modelId of preferred) {
 		if (filteredModels.some((m) => m.id === modelId)) {
 			return modelId;