@ottocode/sdk 0.1.314 → 0.1.315

package/package.json

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

package/src/config/src/index.ts

@@ -25,7 +25,7 @@ const DEFAULT_PROVIDER_SETTINGS: OttoConfig['providers'] = {
 	xai: { enabled: false },
 	zai: { enabled: false },
 	'zai-coding': { enabled: false },
-	moonshot: { enabled: false },
+	kimi: { enabled: false },
 	minimax: { enabled: false },
 };
 
@@ -42,6 +42,7 @@ const DEFAULTS: {
 		reasoningText: true,
 		reasoningLevel: 'high',
 		theme: 'dark',
+		tuiTheme: 'tokyo-night',
 		vimMode: false,
 		compactThread: true,
 		fontFamily: 'IBM Plex Mono',

package/src/config/src/manager.ts

@@ -86,6 +86,7 @@ export async function writeDefaults(
 		reasoningText: boolean;
 		reasoningLevel: 'minimal' | 'low' | 'medium' | 'high' | 'max' | 'xhigh';
 		theme: string;
+		tuiTheme: string;
 		vimMode: boolean;
 		compactThread: boolean;
 		fontFamily: string;

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

@@ -33,7 +33,6 @@ export type ProviderName =
 	| 'xai'
 	| 'zai'
 	| 'zai-coding'
-	| 'moonshot'
 	| 'kimi'
 	| 'minimax';
 
@@ -222,7 +221,7 @@ export async function resolveModel(
 		});
 	}
 
-	if (provider === 'moonshot' || provider === 'kimi') {
+	if (provider === 'kimi') {
 		return createKimiModel(model, {
 			apiKey: config.apiKey,
 			baseURL: config.baseURL,

package/src/core/src/tools/builtin/fs/edit.txt

@@ -1,6 +1,6 @@
 Replace an exact text block in an existing file.
 
-Use this for targeted edits instead of structural patch-style editing whenever possible.
+Prefer `apply_patch` for most code/text edits when it is available, because it produces the clearest diff preview. Use `edit` when you have one precise old/new text replacement, when a patch would be awkward, or after patch attempts fail.
 
 Rules:
 - You must read the file first in the current session before editing it.

package/src/core/src/tools/builtin/fs/index.ts

@@ -9,6 +9,8 @@ import { buildTreeTool } from './tree.ts';
 import { buildPwdTool } from './pwd.ts';
 import { buildCdTool } from './cd.ts';
 
+export { rememberFileRead } from './read-tracker.ts';
+
 export function buildFsTools(
 	projectRoot: string,
 ): Array<{ name: string; tool: Tool }> {

package/src/core/src/tools/builtin/fs/multiedit.txt

@@ -1,6 +1,6 @@
 Apply multiple exact text replacements to a single existing file atomically.
 
-Use this when you need several edits in one file.
+Prefer `apply_patch` for most code/text edits when it is available, especially when a diff is easy to express. Use `multiedit` when you have several precise old/new replacements in one file, when a patch would be awkward, or after patch attempts fail.
 
 Rules:
 - Read the file first before editing.

package/src/core/src/tools/builtin/glob.txt

@@ -6,8 +6,12 @@
 
 **Use `glob` first to discover files** before reading them, unless you already know exact paths.
 
+Think of `glob` as the repository's fast local `find` replacement for filenames and paths. Use it before shelling out to `find`, `fd`, or `ls **`.
+
 ## Usage tips
 
 - Use `glob` for filename patterns; use `search` for file contents.
 - Combine with `path` to restrict the search to a subdirectory.
 - Prefer reading a known file directly over globbing to "find" it (check the `<project>` listing in the system prompt first).
+- Instead of `find packages -name "*.ts"`, call `glob` with `pattern: "packages/**/*.ts"`.
+- Instead of `find apps -name package.json`, call `glob` with `pattern: "apps/**/package.json"`.

package/src/core/src/tools/builtin/patch/indentation.ts

@@ -23,6 +23,7 @@ export function adjustReplacementIndentation(
 	let fileIndentChar: 'tab' | 'space' = 'space';
 	const deltas: number[] = [];
 	let hasAddStyleMismatch = false;
+	let hasContextContentMismatch = false;
 	let fileIndentDetected = false;
 
 	for (const fl of matchedFileLines) {
@@ -81,6 +82,7 @@ export function adjustReplacementIndentation(
 		if (line.kind === 'context') {
 			const fileLine = matchedFileLines[expectedIdx];
 			if (fileLine !== undefined) {
+				if (line.content !== fileLine) hasContextContentMismatch = true;
 				lastDelta = computeIndentDelta(line.content, fileLine, tabSize);
 				lastFileIndentExpanded = expandWhitespace(
 					getLeadingWhitespace(fileLine),
@@ -152,7 +154,12 @@ export function adjustReplacementIndentation(
 		}
 	}
 
-	if (!hasDelta && !hasStyleMismatch && !hasAddStyleMismatch) {
+	if (
+		!hasDelta &&
+		!hasStyleMismatch &&
+		!hasAddStyleMismatch &&
+		!hasContextContentMismatch
+	) {
 		return hunk.lines.filter((l) => l.kind !== 'remove').map((l) => l.content);
 	}
 

package/src/core/src/tools/builtin/patch/normalize.ts

@@ -3,6 +3,7 @@ enum NormalizationLevel {
 	TABS_ONLY = 'tabs',
 	WHITESPACE = 'whitespace',
 	AGGRESSIVE = 'aggressive',
+	COLLAPSED = 'collapsed',
 }
 
 const DEFAULT_TAB_SIZE = 2;
@@ -22,6 +23,8 @@ export function normalizeWhitespace(
 			return line.replace(/\t/g, tabReplacement).replace(/\s+$/, '');
 		case NormalizationLevel.AGGRESSIVE:
 			return line.replace(/\t/g, tabReplacement).trim();
+		case NormalizationLevel.COLLAPSED:
+			return line.replace(/\t/g, tabReplacement).trim().replace(/\s+/g, ' ');
 		default:
 			return line;
 	}
@@ -32,6 +35,7 @@ export const NORMALIZATION_LEVELS: NormalizationLevel[] = [
 	NormalizationLevel.TABS_ONLY,
 	NormalizationLevel.WHITESPACE,
 	NormalizationLevel.AGGRESSIVE,
+	NormalizationLevel.COLLAPSED,
 ];
 
 export function getLeadingWhitespace(line: string): string {

package/src/core/src/tools/builtin/patch/repair.ts

@@ -13,10 +13,30 @@ import {
 
 export function repairPatchContent(patch: string): string {
 	patch = extractPatchFromWrappedJson(patch);
+	patch = extractEnvelopedPatchFromText(patch);
+	patch = stripTrailingMarkdownFenceBeforeMissingEndMarker(patch);
 	patch = appendMissingEndMarker(patch);
+	patch = trimAfterEndMarker(patch);
 	return patch;
 }
 
+function looksLikeUnifiedPatch(patch: string): boolean {
+	const trimmed = patch.trimStart();
+	return (
+		trimmed.startsWith('diff --git ') ||
+		trimmed.startsWith('--- ') ||
+		trimmed.startsWith('Index: ')
+	);
+}
+
+function extractEnvelopedPatchFromText(patch: string): string {
+	const beginIndex = patch.indexOf(PATCH_BEGIN_MARKER);
+	if (beginIndex === -1) return patch;
+	if (beginIndex === patch.search(/\S/)) return patch;
+	if (looksLikeUnifiedPatch(patch)) return patch;
+	return patch.slice(beginIndex);
+}
+
 function extractPatchFromWrappedJson(patch: string): string {
 	if (patch.includes(PATCH_BEGIN_MARKER)) return patch;
 
@@ -61,3 +81,25 @@ function appendMissingEndMarker(patch: string): string {
 
 	return patch;
 }
+
+function stripTrailingMarkdownFenceBeforeMissingEndMarker(
+	patch: string,
+): string {
+	const trimmed = patch.trimEnd();
+	if (!trimmed.trimStart().startsWith(PATCH_BEGIN_MARKER)) return patch;
+	if (trimmed.includes(PATCH_END_MARKER)) return patch;
+	const lines = trimmed.split('\n');
+	const last = lines.at(-1)?.trim();
+	if (last !== '```') return patch;
+	return lines.slice(0, -1).join('\n');
+}
+
+function trimAfterEndMarker(patch: string): string {
+	if (!patch.trimStart().startsWith(PATCH_BEGIN_MARKER)) return patch;
+	const endIndex = patch.indexOf(PATCH_END_MARKER);
+	if (endIndex === -1) return patch;
+	const endOfMarker = endIndex + PATCH_END_MARKER.length;
+	const suffix = patch.slice(endOfMarker);
+	if (suffix.trim().length === 0) return patch;
+	return patch.slice(0, endOfMarker);
+}

package/src/core/src/tools/builtin/patch.txt

@@ -1,5 +1,7 @@
 Apply a patch to modify one or more files.
 
+Prefer this as the first-choice editing tool for code and text changes when it is available. Use exact-replacement tools (`edit`/`multiedit`) when a patch would be awkward, when you only need a precise old/new string replacement, or after patch attempts fail.
+
 Use the **enveloped format** by default. Standard unified diffs (`---` / `+++`) are also accepted.
 
 ## Fastest / safest mode (recommended): Replace

package/src/core/src/tools/builtin/search.txt

@@ -5,6 +5,8 @@
 
 Use this for text/code search across the codebase. It is the primary tool for repository content discovery.
 
+Think of `search` as the repository's fast local `rg`/`grep` replacement: use it for exact string and regex searches before reaching for shell commands.
+
 ## Usage tips
 
 - Narrow broad searches with `path` and `glob` values.
@@ -12,3 +14,5 @@ Use this for text/code search across the codebase. It is the primary tool for re
 - Batch independent searches (e.g. multiple function names) in a single turn for parallel execution.
 - Use `ignoreCase: true` for case-insensitive matching; pass `glob` patterns (e.g. `["*.ts", "*.tsx"]`) to limit file types.
 - For filename/path discovery, use `glob` first when you already know the file pattern.
+- Instead of `grep -r "workspace:" packages apps`, call `search` with `query: "workspace:"`, `path: "."`, and `glob: ["**/package.json"]`.
+- Instead of `rg "function foo" src`, call `search` with `query: "function foo"` and `path: "src"`.

package/src/core/src/tools/builtin/shell.ts

@@ -46,6 +46,7 @@ function killProcessTree(pid: number) {
 }
 
 const REDIRECTED_SEARCH_COMMANDS = new Set(['grep', 'egrep', 'fgrep', 'rg']);
+const REDIRECTED_GLOB_COMMANDS = new Set(['find', 'fd']);
 
 /**
  * Detect commands that start with a standalone grep-style search binary.
@@ -53,23 +54,55 @@ const REDIRECTED_SEARCH_COMMANDS = new Set(['grep', 'egrep', 'fgrep', 'rg']);
  * with grep/rg are redirected to the dedicated `search` tool.
  */
 export function findRedirectedSearchCommand(cmd: string): string | null {
+	return findRepositoryDiscoveryCommand(cmd, 'search')?.command ?? null;
+}
+
+function commandTokens(segment: string): string[] {
+	const tokens = segment.trim().split(/\s+/).filter(Boolean);
+	let index = 0;
+	while (
+		index < tokens.length &&
+		/^[A-Za-z_][A-Za-z0-9_]*=/.test(tokens[index] ?? '')
+	) {
+		index++;
+	}
+	if (tokens[index] === 'command') index++;
+	return tokens.slice(index);
+}
+
+function findRepositoryDiscoveryCommand(
+	cmd: string,
+	kind?: 'search' | 'glob',
+): { command: string; tool: 'search' | 'glob' } | null {
 	const segments = cmd.split(/&&|\|\||;|\n/);
 	for (const segment of segments) {
-		const tokens = segment.trim().split(/\s+/);
-		let index = 0;
-		while (
-			index < tokens.length &&
-			/^[A-Za-z_][A-Za-z0-9_]*=/.test(tokens[index] ?? '')
-		) {
-			index++;
+		const tokens = commandTokens(segment);
+		const bin = tokens[0]?.split('/').pop() ?? '';
+		const second = tokens[1] ?? '';
+		if ((!kind || kind === 'search') && bin === 'git' && second === 'grep') {
+			return { command: 'git grep', tool: 'search' };
+		}
+		if ((!kind || kind === 'search') && REDIRECTED_SEARCH_COMMANDS.has(bin)) {
+			return { command: bin, tool: 'search' };
+		}
+		if ((!kind || kind === 'glob') && REDIRECTED_GLOB_COMMANDS.has(bin)) {
+			return { command: bin, tool: 'glob' };
+		}
+		if ((!kind || kind === 'glob') && bin === 'ls' && segment.includes('**')) {
+			return { command: 'ls **', tool: 'glob' };
 		}
-		if (tokens[index] === 'command') index++;
-		const bin = tokens[index]?.split('/').pop() ?? '';
-		if (REDIRECTED_SEARCH_COMMANDS.has(bin)) return bin;
 	}
 	return null;
 }
 
+function repositoryDiscoveryHint(cmd: string): string | undefined {
+	const discovery = findRepositoryDiscoveryCommand(cmd);
+	if (!discovery) return undefined;
+	return discovery.tool === 'search'
+		? `Tip: For repository content search, prefer the search tool instead of shelling out to ${discovery.command}. It is indexed, faster, and returns structured file:line matches.`
+		: `Tip: For repository file discovery, prefer the glob tool instead of shelling out to ${discovery.command}. It returns structured paths and skips common build/cache folders.`;
+}
+
 export type ShellOutputMode = 'auto' | 'full' | 'tail';
 
 const DEFAULT_TAIL_LINES = 100;
@@ -136,6 +169,7 @@ type ShellResult = ToolResponse<{
 	stderrTruncated?: boolean;
 	stderrOriginalBytes?: number;
 	stderrShownBytes?: number;
+	discoveryHint?: string;
 }>;
 
 type ShellStreamChunk =
@@ -446,11 +480,13 @@ export function buildShellTool(projectRoot: string): {
 					return;
 				}
 
+				const discoveryHint = repositoryDiscoveryHint(finalCmd);
 				settle({
 					ok: true,
 					exitCode: exitCode ?? 0,
 					stdout,
 					stderr,
+					...(discoveryHint ? { discoveryHint } : {}),
 					...(outputMode === 'tail' || outputMode === 'auto'
 						? { outputMode, tailLines, maxOutputBytes }
 						: { outputMode, maxOutputBytes }),

package/src/core/src/tools/builtin/shell.txt

@@ -8,6 +8,11 @@ For repository discovery, use `search` for content/code search and `glob` for fi
 
 **Strongly prefer the `search` tool over `grep`/`rg`, and `glob` over `find`.** The `search` tool is indexed and faster, returns structured `file:line` matches, and supports regex, `glob` includes, `path` scoping, and `ignoreCase` — use it for all repository content search. Only fall back to `grep`/`rg` via shell for cases `search` cannot handle (e.g. gitignored files like node_modules or build output). Pipelines that filter program output (e.g. `ps aux | grep node`) are fine.
 
+Mapping from common shell habits:
+- `grep -r` / `rg` / `git grep` over repo files → use `search`.
+- `find` / `fd` / recursive `ls` for filenames → use `glob`.
+- Build, test, package manager, diagnostics, process inspection → use `shell`.
+
 ## Usage tips
 
 - Chain commands with `&&` to fail-fast.

package/src/core/src/tools/loader.ts

@@ -142,7 +142,14 @@ async function discoverStaticProjectTools(
 
 	const discoveryPromise = (async () => {
 		const tools = new Map<string, Tool>();
-		for (const { name, tool } of buildFsTools(projectRoot))
+		const fsTools = buildFsTools(projectRoot);
+		for (const { name, tool } of fsTools.filter(({ name }) => name === 'read'))
+			tools.set(name, tool);
+		// Put apply_patch before exact replacement tools so models see it as the
+		// default editing path after reading files.
+		const ap = buildApplyPatchTool(projectRoot);
+		tools.set(ap.name, ap.tool);
+		for (const { name, tool } of fsTools.filter(({ name }) => name !== 'read'))
 			tools.set(name, tool);
 		for (const { name, tool } of buildGitTools(projectRoot))
 			tools.set(name, tool);
@@ -155,9 +162,6 @@ async function discoverStaticProjectTools(
 		tools.set(search.name, search.tool);
 		const glob = buildGlobTool(projectRoot);
 		tools.set(glob.name, glob.tool);
-		// Patch/apply
-		const ap = buildApplyPatchTool(projectRoot);
-		tools.set(ap.name, ap.tool);
 		// Todo tracking
 		tools.set('update_todos', updateTodosTool);
 		// Web search

package/src/index.ts

@@ -81,6 +81,7 @@ export type {
 } from './providers/src/index.ts';
 export {
 	isBuiltInProviderId,
+	resolveBuiltInProviderCatalogId,
 	getProviderSettings,
 	getProviderDefinition,
 	hasConfiguredProvider,
@@ -162,13 +163,9 @@ export { createOpencodeModel } from './providers/src/index.ts';
 export type { OpencodeProviderConfig } from './providers/src/index.ts';
 export {
 	createKimiModel,
-	createMoonshotModel,
 	readKimiApiKeyFromEnv,
 } from './providers/src/index.ts';
-export type {
-	KimiProviderConfig,
-	MoonshotProviderConfig,
-} from './providers/src/index.ts';
+export type { KimiProviderConfig } from './providers/src/index.ts';
 export { createMinimaxModel } from './providers/src/index.ts';
 export type { MinimaxProviderConfig } from './providers/src/index.ts';
 export {

package/src/prompts/src/agents/build.txt

@@ -8,8 +8,8 @@ You help with coding and build tasks.
 
 Pick the right tool for the job (each tool's description has its full contract):
 
-- Use the exact-replacement editing tools available to you for targeted changes in existing files.
-- Use patch-style editing for structural diffs, file add/delete/rename, or multi-file changes when that capability is available.
+- Prefer `apply_patch` for code and text changes when it is available. It gives the clearest diff preview and handles targeted, structural, and multi-file edits.
+- Use exact-replacement tools (`edit`/`multiedit`) when a patch would be awkward, when you have a precise replacement block, or after patch attempts fail.
 - Use `write` only for NEW files or >70% full-file rewrites. Never use it for targeted edits.
 
 **Always read a file immediately before editing it.** Memory and earlier context are not reliable — the file may have changed.

package/src/prompts/src/providers/{moonshot.txt → kimi.txt}

@@ -1,4 +1,4 @@
-You are Kimi, an agentic coding assistant by Moonshot AI operating in otto in Thinking mode. Precise, safe, helpful.
+You are Kimi, an agentic coding assistant operating in otto in Thinking mode. Precise, safe, helpful.
 
 # Reasoning
 

package/src/prompts/src/providers.ts

@@ -14,7 +14,7 @@ import PROVIDER_ANTHROPIC from './providers/anthropic.txt' with {
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import PROVIDER_GOOGLE from './providers/google.txt' with { type: 'text' };
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
-import PROVIDER_MOONSHOT from './providers/moonshot.txt' with { type: 'text' };
+import PROVIDER_KIMI from './providers/kimi.txt' with { type: 'text' };
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import PROVIDER_DEFAULT from './providers/default.txt' with { type: 'text' };
 // eslint-disable-next-line @typescript-eslint/consistent-type-imports
@@ -24,7 +24,7 @@ const FAMILY_PROMPTS: Record<string, string> = {
 	openai: PROVIDER_OPENAI,
 	anthropic: PROVIDER_ANTHROPIC,
 	google: PROVIDER_GOOGLE,
-	moonshot: PROVIDER_MOONSHOT,
+	kimi: PROVIDER_KIMI,
 	glm: PROVIDER_GLM,
 	minimax: PROVIDER_DEFAULT,
 };
@@ -142,9 +142,9 @@ export async function providerBasePrompt(
 		const result = PROVIDER_GOOGLE.trim();
 		return { prompt: result, resolvedType: 'google' };
 	}
-	if (id === 'moonshot') {
-		const result = PROVIDER_MOONSHOT.trim();
-		return { prompt: result, resolvedType: 'moonshot' };
+	if (id === 'kimi') {
+		const result = PROVIDER_KIMI.trim();
+		return { prompt: result, resolvedType: 'kimi' };
 	}
 	if (id === 'zai' || id === 'zai-coding') {
 		const result = PROVIDER_GLM.trim();

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

@@ -46,7 +46,7 @@ const OWNER_NPM: Record<ModelOwner, string> = {
 	google: '@ai-sdk/google',
 	openrouter: '@openrouter/ai-sdk-provider',
 	xai: '@ai-sdk/xai',
-	moonshot: '@ai-sdk/openai-compatible',
+	kimi: '@ai-sdk/openai-compatible',
 	qwen: '@ai-sdk/openai-compatible',
 	zai: '@ai-sdk/openai-compatible',
 	minimax: '@ai-sdk/anthropic',
@@ -162,21 +162,53 @@ const DEPRECATED_KIMI_MODEL_IDS = new Set([
 	'kimi-k2-turbo-preview',
 ]);
 
+const KIMI_MANUAL_MODELS: ModelInfo[] = [
+	{
+		id: 'kimi-k2.7-code-highspeed',
+		ownedBy: 'kimi',
+		label: 'Kimi K2.7 Code Highspeed',
+		modalities: { input: ['text', 'image', 'video'], output: ['text'] },
+		toolCall: true,
+		reasoningText: true,
+		attachment: true,
+		temperature: false,
+		knowledge: '2025-01',
+		openWeights: true,
+		cost: { input: 1.9, output: 8, cacheRead: 0.38 },
+		limit: { context: 262_144, output: 262_144 },
+	},
+];
+
 export function filterAvailableKimiModels(models: ModelInfo[]): ModelInfo[] {
 	return models.filter((model) => !DEPRECATED_KIMI_MODEL_IDS.has(model.id));
 }
 
+function appendKimiManualModels(models: ModelInfo[]): ModelInfo[] {
+	const manualById = new Map(
+		KIMI_MANUAL_MODELS.map((model) => [model.id, model]),
+	);
+	const mergedModels = models.map((model) => {
+		const override = manualById.get(model.id);
+		return override ? { ...model, ...override } : model;
+	});
+	const existingIds = new Set(mergedModels.map((model) => model.id));
+	const missingModels = KIMI_MANUAL_MODELS.filter(
+		(model) => !existingIds.has(model.id),
+	);
+	return missingModels.length
+		? [...mergedModels, ...missingModels]
+		: mergedModels;
+}
+
 export function applyOfficialKimiCatalogMetadata<
 	T extends ProviderCatalogEntry,
 >(entry: T | undefined): T | undefined {
 	if (!entry) return undefined;
-	const env = Array.from(
-		new Set(['KIMI_API_KEY', 'MOONSHOT_API_KEY', ...(entry.env ?? [])]),
-	);
+	const env = Array.from(new Set(['KIMI_API_KEY', ...(entry.env ?? [])]));
 	return {
 		...entry,
-		models: filterAvailableKimiModels(entry.models),
-		label: entry.label === 'Moonshot AI' ? 'Kimi' : entry.label,
+		models: appendKimiManualModels(filterAvailableKimiModels(entry.models)),
+		label: 'Kimi',
 		env,
 		doc: 'https://platform.kimi.ai/docs/api/overview.md',
 	};
@@ -195,9 +227,9 @@ export function mergeManualCatalog(
 	if (xaiEntry) {
 		merged.xai = xaiEntry;
 	}
-	const moonshotEntry = applyOfficialKimiCatalogMetadata(merged.moonshot);
-	if (moonshotEntry) {
-		merged.moonshot = moonshotEntry;
+	const kimiEntry = applyOfficialKimiCatalogMetadata(merged.kimi);
+	if (kimiEntry) {
+		merged.kimi = kimiEntry;
 	}
 	if (manualEntry) {
 		merged[OTTOROUTER_ID] = manualEntry;

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

package/src/providers/src/utils.ts

@@ -46,13 +46,13 @@ 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.7-code'],
+	kimi: ['kimi-k2.7-code'],
 };
 
 const PREFERRED_FAST_MODELS_OAUTH: Partial<Record<ProviderId, string[]>> = {
 	openai: ['gpt-5.4-mini'],
 	anthropic: ['claude-haiku-4-5'],
-	moonshot: ['kimi-k2.7-code'],
+	kimi: ['kimi-k2.7-code'],
 };
 
 function preferredFastModelKey(provider: ProviderId): ProviderId {
@@ -148,7 +148,7 @@ const OWNER_TO_FAMILY: Record<ModelOwner, UnderlyingProviderKey> = {
 	google: 'google',
 	openrouter: 'openai-compatible',
 	xai: 'openai',
-	moonshot: 'moonshot',
+	kimi: 'kimi',
 	qwen: 'openai-compatible',
 	zai: 'glm',
 	minimax: 'minimax',
@@ -161,7 +161,7 @@ const DIRECT_PROVIDER_FAMILY: Partial<
 	anthropic: 'anthropic',
 	google: 'google',
 	'ollama-cloud': 'openai-compatible',
-	moonshot: 'moonshot',
+	kimi: 'kimi',
 	minimax: 'minimax',
 	copilot: 'openai',
 	xai: 'openai',
@@ -173,7 +173,7 @@ export type UnderlyingProviderKey =
 	| 'anthropic'
 	| 'openai'
 	| 'google'
-	| 'moonshot'
+	| 'kimi'
 	| 'minimax'
 	| 'glm'
 	| 'openai-compatible'
@@ -193,8 +193,7 @@ function inferFromModelId(model: string): UnderlyingProviderKey {
 	if (lower.includes('grok') || lower.startsWith('xai/')) return 'openai';
 	if (lower.includes('qwen') || lower.startsWith('qwen/'))
 		return 'openai-compatible';
-	if (lower.includes('kimi') || lower.startsWith('moonshotai/'))
-		return 'moonshot';
+	if (lower.includes('kimi') || lower.startsWith('moonshotai/')) return 'kimi';
 	if (
 		lower.includes('glm') ||
 		lower.startsWith('z-ai/') ||
@@ -265,7 +264,7 @@ function getProviderModels(provider: ProviderId): ModelInfo[] {
 		catalogProvider ?? provider,
 	)?.models;
 	const models = mergeModelLists(catalogModels, cachedModels);
-	return catalogProvider === 'moonshot'
+	return catalogProvider === 'kimi'
 		? filterAvailableKimiModels(models)
 		: models;
 }

package/src/types/src/config.ts

@@ -31,6 +31,7 @@ export type DefaultConfig = {
 	reasoningText?: boolean;
 	reasoningLevel?: ReasoningLevel;
 	theme?: string;
+	tuiTheme?: string;
 	vimMode?: boolean;
 	compactThread?: boolean;
 	fontFamily?: string;

package/src/types/src/provider.ts

@@ -13,7 +13,7 @@ export type BuiltInProviderId =
 	| 'xai'
 	| 'zai'
 	| 'zai-coding'
-	| 'moonshot'
+	| 'kimi'
 	| 'minimax';
 
 /**
@@ -40,7 +40,7 @@ export type ProviderPromptFamily =
 	| 'anthropic'
 	| 'openai'
 	| 'google'
-	| 'moonshot'
+	| 'kimi'
 	| 'minimax'
 	| 'glm'
 	| 'openai-compatible';
@@ -52,7 +52,7 @@ export type ProviderFamily =
 	| 'openai'
 	| 'anthropic'
 	| 'google'
-	| 'moonshot'
+	| 'kimi'
 	| 'minimax'
 	| 'openai-compatible';
 
@@ -66,7 +66,7 @@ export type ModelOwner =
 	| 'google'
 	| 'openrouter'
 	| 'xai'
-	| 'moonshot'
+	| 'kimi'
 	| 'qwen'
 	| 'zai'
 	| 'minimax';