@ottocode/sdk 0.1.313 → 0.1.315

package/src/providers/src/catalog.ts

@@ -2161,6 +2161,46 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 						output: 32768,
 					},
 				},
+				{
+					id: 'gemma-4-E2B-it',
+					ownedBy: 'google',
+					label: 'Gemma 4 E2B IT',
+					modalities: {
+						input: ['text', 'image', 'audio'],
+						output: ['text'],
+					},
+					toolCall: true,
+					reasoningText: true,
+					attachment: true,
+					temperature: true,
+					releaseDate: '2026-04-02',
+					lastUpdated: '2026-04-02',
+					openWeights: true,
+					limit: {
+						context: 131072,
+						output: 8192,
+					},
+				},
+				{
+					id: 'gemma-4-E4B-it',
+					ownedBy: 'google',
+					label: 'Gemma 4 E4B IT',
+					modalities: {
+						input: ['text', 'image', 'audio'],
+						output: ['text'],
+					},
+					toolCall: true,
+					reasoningText: true,
+					attachment: true,
+					temperature: true,
+					releaseDate: '2026-04-02',
+					lastUpdated: '2026-04-02',
+					openWeights: true,
+					limit: {
+						context: 131072,
+						output: 8192,
+					},
+				},
 			],
 			label: 'Google',
 			env: ['GOOGLE_API_KEY', 'GOOGLE_GENERATIVE_AI_API_KEY', 'GEMINI_API_KEY'],
@@ -2329,8 +2369,8 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: '~moonshotai/kimi-latest',
-					ownedBy: 'moonshot',
-					label: 'MoonshotAI Kimi Latest',
+					ownedBy: 'kimi',
+					label: 'Kimi Latest',
 					modalities: {
 						input: ['text', 'image'],
 						output: ['text'],
@@ -3398,13 +3438,13 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					lastUpdated: '2026-04-24',
 					openWeights: true,
 					cost: {
-						input: 0.098,
-						output: 0.196,
+						input: 0.09,
+						output: 0.18,
 						cacheRead: 0.02,
 					},
 					limit: {
-						context: 1048575,
-						output: 131072,
+						context: 1000000,
+						output: 65536,
 					},
 				},
 				{
@@ -4353,7 +4393,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 					temperature: true,
 					releaseDate: '2026-06-01',
 					lastUpdated: '2026-06-01',
-					openWeights: false,
+					openWeights: true,
 					cost: {
 						input: 0.3,
 						output: 1.2,
@@ -4783,7 +4823,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'moonshotai/kimi-k2',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2 0711',
 					modalities: {
 						input: ['text'],
@@ -4808,7 +4848,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'moonshotai/kimi-k2-0905',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2 0905',
 					modalities: {
 						input: ['text'],
@@ -4833,7 +4873,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'moonshotai/kimi-k2-thinking',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2 Thinking',
 					modalities: {
 						input: ['text'],
@@ -4858,7 +4898,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'moonshotai/kimi-k2.5',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2.5',
 					modalities: {
 						input: ['text', 'image'],
@@ -4883,7 +4923,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'moonshotai/kimi-k2.6',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2.6',
 					modalities: {
 						input: ['text', 'image'],
@@ -4909,7 +4949,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'moonshotai/kimi-k2.7-code',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2.7 Code',
 					modalities: {
 						input: ['text', 'image'],
@@ -9722,7 +9762,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2',
 					modalities: {
 						input: ['text'],
@@ -9748,7 +9788,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2-thinking',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2 Thinking',
 					modalities: {
 						input: ['text'],
@@ -9774,7 +9814,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2.5',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2.5',
 					modalities: {
 						input: ['text', 'image', 'video'],
@@ -9800,7 +9840,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2.5-free',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2.5 Free',
 					modalities: {
 						input: ['text', 'image', 'video'],
@@ -9826,7 +9866,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2.6',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2.6',
 					modalities: {
 						input: ['text', 'image', 'video'],
@@ -11008,12 +11048,12 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 			api: 'https://api.z.ai/api/coding/paas/v4',
 			doc: 'https://docs.z.ai/devpack/overview',
 		},
-		moonshot: {
-			id: 'moonshot',
+		kimi: {
+			id: 'kimi',
 			models: [
 				{
 					id: 'kimi-k2-0711-preview',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2 0711',
 					modalities: {
 						input: ['text'],
@@ -11039,7 +11079,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2-0905-preview',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2 0905',
 					modalities: {
 						input: ['text'],
@@ -11065,7 +11105,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2-thinking',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2 Thinking',
 					modalities: {
 						input: ['text'],
@@ -11091,7 +11131,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2-thinking-turbo',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2 Thinking Turbo',
 					modalities: {
 						input: ['text'],
@@ -11117,7 +11157,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2-turbo-preview',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2 Turbo',
 					modalities: {
 						input: ['text'],
@@ -11143,7 +11183,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2.5',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2.5',
 					modalities: {
 						input: ['text', 'image', 'video'],
@@ -11169,7 +11209,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2.6',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2.6',
 					modalities: {
 						input: ['text', 'image', 'video'],
@@ -11195,7 +11235,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2.7-code',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'Kimi K2.7 Code',
 					modalities: {
 						input: ['text', 'image', 'video'],
@@ -11221,7 +11261,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 			],
 			label: 'Kimi',
-			env: ['KIMI_API_KEY', 'MOONSHOT_API_KEY'],
+			env: ['KIMI_API_KEY'],
 			npm: '@ai-sdk/openai-compatible',
 			api: 'https://api.moonshot.ai/v1',
 			doc: 'https://platform.kimi.ai/docs/api/overview.md',
@@ -12313,7 +12353,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2-thinking',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'kimi-k2-thinking',
 					modalities: {
 						input: ['text'],
@@ -12333,7 +12373,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2:1t',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'kimi-k2:1t',
 					modalities: {
 						input: ['text'],
@@ -12353,7 +12393,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2.5',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'kimi-k2.5',
 					modalities: {
 						input: ['text', 'image'],
@@ -12372,7 +12412,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2.6',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'kimi-k2.6',
 					modalities: {
 						input: ['text', 'image'],
@@ -12391,7 +12431,7 @@ export const catalog: Partial<Record<BuiltInProviderId, ProviderCatalogEntry>> =
 				},
 				{
 					id: 'kimi-k2.7-code',
-					ownedBy: 'moonshot',
+					ownedBy: 'kimi',
 					label: 'kimi-k2.7-code',
 					modalities: {
 						input: ['text', 'image'],

package/src/providers/src/env.ts

@@ -1,5 +1,5 @@
 import type { BuiltInProviderId, ProviderId } from '../../types/src/index.ts';
-import { readKimiApiKeyFromEnv } from './moonshot-client.ts';
+import { readKimiApiKeyFromEnv } from './kimi-client.ts';
 
 const ENV_VARS: Record<BuiltInProviderId, string> = {
 	openai: 'OPENAI_API_KEY',
@@ -13,19 +13,16 @@ const ENV_VARS: Record<BuiltInProviderId, string> = {
 	xai: 'XAI_API_KEY',
 	zai: 'ZAI_API_KEY',
 	'zai-coding': 'ZAI_CODING_API_KEY',
-	moonshot: 'KIMI_API_KEY',
+	kimi: '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)) {
+	if (provider === 'kimi') {
 		const value = readKimiApiKeyFromEnv();
 		return value.length ? value : undefined;
 	}
@@ -48,7 +45,7 @@ export function readEnvKey(provider: ProviderId): string | undefined {
 
 export function setEnvKey(provider: ProviderId, value: string | undefined) {
 	if (!value) return;
-	if (KIMI_PROVIDER_IDS.has(provider)) {
+	if (provider === 'kimi') {
 		process.env.KIMI_API_KEY = value;
 		return;
 	}

package/src/providers/src/index.ts

@@ -52,6 +52,7 @@ export type {
 } from './ollama-discovery.ts';
 export {
 	isBuiltInProviderId,
+	resolveBuiltInProviderCatalogId,
 	getProviderSettings,
 	getProviderDefinition,
 	hasConfiguredProvider,
@@ -123,15 +124,8 @@ export {
 export type { OpenRouterProviderConfig } from './openrouter-client.ts';
 export { createOpencodeModel } from './opencode-client.ts';
 export type { OpencodeProviderConfig } from './opencode-client.ts';
-export {
-	createKimiModel,
-	createMoonshotModel,
-	readKimiApiKeyFromEnv,
-} from './moonshot-client.ts';
-export type {
-	KimiProviderConfig,
-	MoonshotProviderConfig,
-} from './moonshot-client.ts';
+export { createKimiModel, readKimiApiKeyFromEnv } from './kimi-client.ts';
+export type { KimiProviderConfig } from './kimi-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/{moonshot-client.ts → kimi-client.ts}

@@ -8,15 +8,139 @@ export type KimiProviderConfig = {
 	oauth?: OAuth;
 };
 
-/** @deprecated Use `KimiProviderConfig` */
-export type MoonshotProviderConfig = KimiProviderConfig;
-
 export function readKimiApiKeyFromEnv(): string {
-	return process.env.KIMI_API_KEY || process.env.MOONSHOT_API_KEY || '';
+	return process.env.KIMI_API_KEY || '';
+}
+
+const KIMI_UNSUPPORTED_SCHEMA_KEYS = new Set([
+	'$schema',
+	'$id',
+	'$ref',
+	'$defs',
+	'definitions',
+	'examples',
+	'title',
+	'nullable',
+	'format',
+	'pattern',
+	'minLength',
+	'maxLength',
+	'minimum',
+	'maximum',
+	'exclusiveMinimum',
+	'exclusiveMaximum',
+	'multipleOf',
+	'minItems',
+	'maxItems',
+	'uniqueItems',
+	'contains',
+	'minContains',
+	'maxContains',
+	'prefixItems',
+	'propertyNames',
+	'patternProperties',
+	'allOf',
+	'not',
+	'if',
+	'then',
+	'else',
+	'dependentSchemas',
+	'dependentRequired',
+	'unevaluatedProperties',
+]);
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+	return Boolean(value && typeof value === 'object' && !Array.isArray(value));
 }
 
 /**
- * Kimi/Moonshot streaming responses report token usage on the final chunk's
+ * Converts AI SDK JSON Schema output into the smaller schema dialect accepted
+ * by Kimi tool calls.
+ */
+export function sanitizeKimiToolSchema(schema: unknown): unknown {
+	if (Array.isArray(schema))
+		return schema.map((item) => sanitizeKimiToolSchema(item));
+	if (!isRecord(schema)) return schema;
+
+	const out: Record<string, unknown> = {};
+
+	for (const [key, value] of Object.entries(schema)) {
+		if (key === 'const') {
+			if (['number', 'string'].includes(typeof value)) out.enum = [value];
+			continue;
+		}
+		if (key === 'oneOf') {
+			const branches = toArray(value);
+			if (branches.length > 0) out.anyOf = sanitizeKimiToolSchema(branches);
+			continue;
+		}
+		if (key === 'properties' && isRecord(value)) {
+			out.properties = Object.fromEntries(
+				Object.entries(value).map(([propertyName, propertySchema]) => [
+					propertyName,
+					sanitizeKimiToolSchema(propertySchema),
+				]),
+			);
+			continue;
+		}
+		if (KIMI_UNSUPPORTED_SCHEMA_KEYS.has(key)) continue;
+		if (key === 'type' && Array.isArray(value)) {
+			const types = value.filter(
+				(type): type is string => typeof type === 'string',
+			);
+			if (types.length === 1) out.type = types[0];
+			else if (types.length > 1) {
+				out.anyOf = types.map((type) => ({ type }));
+			}
+			continue;
+		}
+		if (key === 'enum' && Array.isArray(value)) {
+			out.enum = value.filter((item) => item !== null);
+			continue;
+		}
+		out[key] = sanitizeKimiToolSchema(value);
+	}
+
+	return out;
+}
+
+function toArray(value: unknown): unknown[] {
+	return Array.isArray(value) ? value : [];
+}
+
+function sanitizeKimiToolRequest(body: unknown): unknown {
+	if (!isRecord(body) || !Array.isArray(body.tools)) return body;
+	let changed = false;
+	const tools = body.tools.map((tool) => {
+		if (!isRecord(tool)) return tool;
+		const fn = tool.function;
+		if (!isRecord(fn) || !('parameters' in fn)) return tool;
+		changed = true;
+		return {
+			...tool,
+			function: {
+				...fn,
+				parameters: sanitizeKimiToolSchema(fn.parameters),
+			},
+		};
+	});
+	return changed ? { ...body, tools } : body;
+}
+
+function sanitizeKimiFetchInit(init?: RequestInit): RequestInit | undefined {
+	if (!init || typeof init.body !== 'string') return init;
+	try {
+		const parsed = JSON.parse(init.body) as unknown;
+		const sanitized = sanitizeKimiToolRequest(parsed);
+		if (sanitized === parsed) return init;
+		return { ...init, body: JSON.stringify(sanitized) };
+	} catch {
+		return init;
+	}
+}
+
+/**
+ * Kimi 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.
@@ -57,7 +181,7 @@ export function createKimiUsageFetch(
 		input: Parameters<typeof fetch>[0],
 		init?: Parameters<typeof fetch>[1],
 	): Promise<Response> => {
-		const response = await baseFetch(input, init);
+		const response = await baseFetch(input, sanitizeKimiFetchInit(init));
 		const contentType = response.headers.get('content-type') ?? '';
 		if (
 			!response.ok ||
@@ -100,7 +224,7 @@ export function createKimiUsageFetch(
 }
 
 export function createKimiModel(model: string, config?: KimiProviderConfig) {
-	const entry = catalog.moonshot;
+	const entry = catalog.kimi;
 	const oauthAccess = config?.oauth?.access;
 	const defaultApiBaseURL = entry?.api ?? 'https://api.moonshot.ai/v1';
 	const configuredBaseURL = config?.baseURL;
@@ -123,11 +247,3 @@ export function createKimiModel(model: string, config?: KimiProviderConfig) {
 
 	return instance(model);
 }
-
-/** @deprecated Use `createKimiModel` */
-export function createMoonshotModel(
-	model: string,
-	config?: MoonshotProviderConfig,
-) {
-	return createKimiModel(model, config);
-}

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

@@ -1,5 +1,11 @@
 import type { ModelInfo } from '../../types/src/index.ts';
 
+function normalizeModelInfo(model: ModelInfo): ModelInfo {
+	return (model.ownedBy as string | undefined) === 'moonshot'
+		? { ...model, ownedBy: 'kimi' }
+		: model;
+}
+
 /**
  * Merge embedded/manual catalog models with cached (remote/local) models by id.
  *
@@ -13,7 +19,7 @@ export function mergeModelLists(
 	cachedModels: ModelInfo[] | undefined,
 ): ModelInfo[] {
 	const base = baseModels ?? [];
-	const cached = cachedModels ?? [];
+	const cached = (cachedModels ?? []).map(normalizeModelInfo);
 	if (!cached.length) return base;
 	if (!base.length) return cached;
 	const cachedById = new Map(cached.map((model) => [model.id, model]));

package/src/providers/src/pricing.ts

@@ -91,7 +91,7 @@ const pricingTable: Record<ProviderName, PricingEntry[]> = {
 	'zai-coding': [
 		// Pricing from catalog entries; leave empty here
 	],
-	moonshot: [
+	kimi: [
 		// Pricing from catalog entries; leave empty here
 	],
 	minimax: [

package/src/providers/src/registry.ts

@@ -39,7 +39,7 @@ const BUILTIN_COMPATIBILITY: Record<BuiltInProviderId, ProviderCompatibility> =
 		xai: 'openai',
 		zai: 'openai-compatible',
 		'zai-coding': 'openai-compatible',
-		moonshot: 'openai-compatible',
+		kimi: 'openai-compatible',
 		minimax: 'anthropic',
 	};
 
@@ -55,7 +55,7 @@ const BUILTIN_FAMILY: Record<BuiltInProviderId, ProviderPromptFamily> = {
 	xai: 'openai',
 	zai: 'glm',
 	'zai-coding': 'glm',
-	moonshot: 'moonshot',
+	kimi: 'kimi',
 	minimax: 'minimax',
 };
 function normalizeOptionalText(value: string | undefined): string | undefined {
@@ -95,8 +95,6 @@ function resolveCustomFamily(
 	return settings.family ?? 'default';
 }
 
-export const KIMI_PROVIDER_ALIAS = 'kimi' as const;
-
 function isCatalogBuiltInProviderId(
 	value: unknown,
 ): value is BuiltInProviderId {
@@ -109,7 +107,6 @@ function isCatalogBuiltInProviderId(
 export function resolveBuiltInProviderCatalogId(
 	provider: ProviderId,
 ): BuiltInProviderId | undefined {
-	if (provider === KIMI_PROVIDER_ALIAS) return 'moonshot';
 	if (isCatalogBuiltInProviderId(provider)) return provider;
 	return undefined;
 }
@@ -117,7 +114,7 @@ export function resolveBuiltInProviderCatalogId(
 export function isBuiltInProviderId(
 	value: unknown,
 ): value is BuiltInProviderId {
-	return isCatalogBuiltInProviderId(value) || value === KIMI_PROVIDER_ALIAS;
+	return isCatalogBuiltInProviderId(value);
 }
 
 export function getProviderSettings(
@@ -138,21 +135,14 @@ export function getProviderDefinition(
 		if (!entry) return undefined;
 		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;
+		const resolvedSettings = settings;
 		return {
 			id: provider,
 			label:
 				resolvedSettings?.label ??
-				(provider === KIMI_PROVIDER_ALIAS
-					? 'Kimi'
-					: (cachedEntry?.label ?? entry.label ?? provider)),
+				cachedEntry?.label ??
+				entry.label ??
+				provider,
 			source: 'built-in',
 			compatibility: BUILTIN_COMPATIBILITY[catalogProvider],
 			family: BUILTIN_FAMILY[catalogProvider],
@@ -202,7 +192,6 @@ export function getConfiguredProviderIds(
 	const includeDisabled = options?.includeDisabled === true;
 	const ids = new Set<ProviderId>([
 		...providerIds,
-		KIMI_PROVIDER_ALIAS,
 		...Object.keys(cfg.providers),
 		cfg.defaults.provider,
 	]);
@@ -280,7 +269,7 @@ 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') {
+	if (provider === 'kimi') {
 		const envValue = readEnvKey(provider);
 		if (envValue?.length) return envValue;
 	}