@ottocode/sdk 0.1.313 → 0.1.315

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

@@ -5,7 +5,10 @@ import { z } from 'zod/v3';
 import DESCRIPTION from './shell.txt' with { type: 'text' };
 import { getShellExecutionConfig } from '../bin-manager.ts';
 import { createToolError, type ToolResponse } from '../error.ts';
-import { injectCoAuthorIntoGitCommit } from './git-identity.ts';
+import {
+	injectCoAuthorIntoGitCommit,
+	shouldCoAuthorCommits,
+} from './git-identity.ts';
 
 function normalizePath(p: string) {
 	const normalized = p.replace(/\\/g, '/');
@@ -43,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.
@@ -50,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;
@@ -133,6 +169,7 @@ type ShellResult = ToolResponse<{
 	stderrTruncated?: boolean;
 	stderrOriginalBytes?: number;
 	stderrShownBytes?: number;
+	discoveryHint?: string;
 }>;
 
 type ShellStreamChunk =
@@ -248,7 +285,10 @@ export function buildShellTool(projectRoot: string): {
 			}
 
 			const absCwd = resolveSafePath(projectRoot, cwd || '.');
-			const finalCmd = injectCoAuthorIntoGitCommit(cmd);
+			const finalCmd = injectCoAuthorIntoGitCommit(
+				cmd,
+				shouldCoAuthorCommits(projectRoot),
+			);
 			const shellExecutor = shellExecutorContext.getStore();
 			if (shellExecutor) {
 				return shellExecutor(
@@ -440,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/builtin/terminal.ts

@@ -5,7 +5,10 @@ import { createToolError } from '../error.ts';
 import type { TerminalManager } from '../../terminals/index.ts';
 import type { TerminalStatus } from '../../terminals/terminal.ts';
 import { normalizeTerminalLine } from '../../utils/ansi.ts';
-import { injectCoAuthorIntoGitCommit } from './git-identity.ts';
+import {
+	injectCoAuthorIntoGitCommit,
+	shouldCoAuthorCommits,
+} from './git-identity.ts';
 
 function shellQuote(segment: string): string {
 	if (/^[a-zA-Z0-9._-]+$/.test(segment)) {
@@ -108,6 +111,7 @@ export function buildTerminalTool(
 		execute: async (params) => {
 			try {
 				const { operation } = params;
+				const coAuthorCommits = shouldCoAuthorCommits(projectRoot);
 
 				switch (operation) {
 					case 'start': {
@@ -169,7 +173,9 @@ export function buildTerminalTool(
 
 						if (initialCommand) {
 							queueMicrotask(() => {
-								term.write(`${injectCoAuthorIntoGitCommit(initialCommand)}\n`);
+								term.write(
+									`${injectCoAuthorIntoGitCommit(initialCommand, coAuthorCommits)}\n`,
+								);
 							});
 						}
 
@@ -243,7 +249,9 @@ export function buildTerminalTool(
 							return createToolError(`Terminal ${params.terminalId} not found`);
 						}
 
-						term.write(injectCoAuthorIntoGitCommit(params.input));
+						term.write(
+							injectCoAuthorIntoGitCommit(params.input, coAuthorCommits),
+						);
 
 						return {
 							ok: true,

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 {
@@ -253,6 +250,20 @@ export type {
 export { loadConfig, read as readConfig } from './config/src/index.ts';
 export {
 	getLocalDataDir,
+	getLegacyProjectDataDir,
+	getOttoHomeDir,
+	getProjectsStateRoot,
+	getProjectId,
+	getProjectConfigDir,
+	getProjectConfigPath,
+	getProjectStateDir,
+	getProjectDbPath,
+	getProjectAttachmentsDir,
+	getProjectDebugDir,
+	getProjectDebugDumpsDir,
+	getProjectLogsDir,
+	getProjectTmpDir,
+	getProjectCacheDir,
 	getGlobalConfigDir,
 	getGlobalConfigPath,
 	getGlobalSkillsConfigPath,
@@ -334,6 +345,7 @@ export {
 export {
 	appendCoAuthorTrailer,
 	injectCoAuthorIntoGitCommit,
+	shouldCoAuthorCommits,
 	OTTOCODE_BOT_NAME,
 	OTTOCODE_BOT_EMAIL,
 	OTTOCODE_CO_AUTHOR,

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',
@@ -154,16 +154,61 @@ export function appendXaiGrokCliModels<T extends { models: ModelInfo[] }>(
 	return { ...entry, models: [...mergedModels, ...missingModels] };
 }
 
+const DEPRECATED_KIMI_MODEL_IDS = new Set([
+	'kimi-k2-0711-preview',
+	'kimi-k2-0905-preview',
+	'kimi-k2-thinking',
+	'kimi-k2-thinking-turbo',
+	'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,
-		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',
 	};
@@ -182,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;