@ottocode/sdk 0.1.314 → 0.1.316

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ottocode/sdk",
-	"version": "0.1.314",
+	"version": "0.1.316",
 	"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';
 
@@ -212,6 +211,7 @@ export async function resolveModel(
 		return createZaiModel(model, {
 			apiKey: config.apiKey,
 			baseURL: config.baseURL,
+			fetch: config.customFetch,
 		});
 	}
 
@@ -219,10 +219,11 @@ export async function resolveModel(
 		return createZaiCodingModel(model, {
 			apiKey: config.apiKey,
 			baseURL: config.baseURL,
+			fetch: config.customFetch,
 		});
 	}
 
-	if (provider === 'moonshot' || provider === 'kimi') {
+	if (provider === 'kimi') {
 		return createKimiModel(model, {
 			apiKey: config.apiKey,
 			baseURL: config.baseURL,

package/src/core/src/tools/bin-manager.ts

@@ -15,6 +15,16 @@ let cachedLoginPath: {
 	path: string | null;
 } | null = null;
 
+let cachedLoginEnv: {
+	key: string;
+	env: NodeJS.ProcessEnv | null;
+} | null = null;
+
+export type ShellEnvMode = 'fast' | 'login-cache' | 'login-fresh';
+
+const ENV_JSON_START = '___OTTO_ENV_JSON_START___';
+const ENV_JSON_END = '___OTTO_ENV_JSON_END___';
+
 export { getAgiBinDir } from './bin-manager/paths.ts';
 
 async function whichBinary(name: string): Promise<string | null> {
@@ -72,29 +82,35 @@ export function getUserShell(): string {
 	return process.env.SHELL || '/bin/bash';
 }
 
-function getShellRcBootstrap(shell: string): string {
-	const shellName = shell.split('/').pop() || '';
-	if (shellName.includes('zsh')) {
-		return 'if [ -f "$HOME/.zshrc" ]; then . "$HOME/.zshrc"; fi';
-	}
-	if (shellName.includes('bash')) {
-		return 'if [ -f "$HOME/.bashrc" ]; then . "$HOME/.bashrc"; fi';
-	}
-	return '';
-}
-
-function getInteractiveShellFlag(shell: string): string {
-	const shellName = shell.split('/').pop() || '';
-	if (shellName.includes('bash')) return '-ic';
-	return '-ilc';
-}
-
-export function getShellExecutionConfig(cmd: string): {
+export function getShellExecutionConfig(
+	cmd: string,
+	options?: { envMode?: ShellEnvMode },
+): {
+	command: string;
+	args: string[];
+	env: NodeJS.ProcessEnv;
+};
+export function getShellExecutionConfig(
+	cmd: string,
+	options: { envMode?: ShellEnvMode } = {},
+): {
 	command: string;
 	args: string[];
 	env: NodeJS.ProcessEnv;
 } {
-	const env = { ...process.env, PATH: getAugmentedPath() };
+	const envMode = options.envMode ?? 'fast';
+	const loginEnv =
+		envMode === 'fast' ? null : getLoginShellEnv(envMode === 'login-fresh');
+	const env = {
+		...process.env,
+		...(loginEnv ?? {}),
+		PATH: mergePaths([
+			getAgiBinDir(),
+			loginEnv?.PATH,
+			getLoginShellPath(),
+			process.env.PATH,
+		]),
+	};
 	if (process.platform === 'win32') {
 		return {
 			command: getUserShell(),
@@ -106,11 +122,56 @@ export function getShellExecutionConfig(cmd: string): {
 	const command = getUserShell();
 	return {
 		command,
-		args: [getInteractiveShellFlag(command), 'eval "$OTTO_SHELL_COMMAND"'],
+		args: ['-c', 'eval "$OTTO_SHELL_COMMAND"'],
 		env: { ...env, OTTO_SHELL_COMMAND: cmd },
 	};
 }
 
+function getLoginShellEnv(refresh: boolean): NodeJS.ProcessEnv | null {
+	const home = process.env.HOME || homedir();
+	const userShell = getUserShell();
+	const cacheKey = [home, userShell, process.env.PATH || ''].join('\0');
+	if (!refresh && cachedLoginEnv?.key === cacheKey) return cachedLoginEnv.env;
+
+	if (process.platform === 'win32') {
+		cachedLoginEnv = { key: cacheKey, env: { ...process.env } };
+		return cachedLoginEnv.env;
+	}
+	try {
+		const output = execFileSync(
+			userShell,
+			[
+				'-ic',
+				`printf '%s\n' ${JSON.stringify(ENV_JSON_START)}; env; printf '%s\n' ${JSON.stringify(ENV_JSON_END)}`,
+			],
+			{
+				timeout: 10000,
+				stdio: ['ignore', 'pipe', 'ignore'],
+				env: {
+					...process.env,
+					HOME: home,
+					USER: process.env.USER || '',
+					SHELL: userShell,
+				},
+			},
+		).toString();
+		const start = output.indexOf(ENV_JSON_START);
+		const end = output.indexOf(ENV_JSON_END, start + ENV_JSON_START.length);
+		if (start >= 0 && end > start) {
+			const env: NodeJS.ProcessEnv = {};
+			const body = output.slice(start + ENV_JSON_START.length, end).trim();
+			for (const line of body.split('\n')) {
+				const separator = line.indexOf('=');
+				if (separator <= 0) continue;
+				env[line.slice(0, separator)] = line.slice(separator + 1);
+			}
+			cachedLoginEnv = { key: cacheKey, env };
+			return env;
+		}
+	} catch {}
+	return null;
+}
+
 function getLoginShellPath(): string | null {
 	const home = process.env.HOME || homedir();
 	const userShell = getUserShell();
@@ -131,10 +192,8 @@ function getLoginShellPath(): string | null {
 
 	for (const shell of shellCandidates) {
 		try {
-			const rcBootstrap = getShellRcBootstrap(shell);
-			const pathCommand = `${rcBootstrap ? `${rcBootstrap}\n` : ''}echo "___PATH___:$PATH"`;
-			const result = execFileSync(shell, ['-ilc', pathCommand], {
-				timeout: 5000,
+			const result = execFileSync(shell, ['-lc', 'echo "___PATH___:$PATH"'], {
+				timeout: 1500,
 				stdio: ['ignore', 'pipe', 'ignore'],
 				env: {
 					...process.env,
@@ -157,19 +216,15 @@ function getLoginShellPath(): string | null {
 }
 
 export function getAugmentedPath(): string {
-	const sep = process.platform === 'win32' ? ';' : ':';
-	const binDir = getAgiBinDir();
-	const current = process.env.PATH || '';
-	const loginPath = getLoginShellPath();
+	return mergePaths([getAgiBinDir(), getLoginShellPath(), process.env.PATH]);
+}
 
+function mergePaths(paths: Array<string | null | undefined>): string {
+	const sep = process.platform === 'win32' ? ';' : ':';
 	const seen = new Set<string>();
 	const parts: string[] = [];
 
-	for (const p of [
-		binDir,
-		...(loginPath ? loginPath.split(sep) : []),
-		...current.split(sep),
-	]) {
+	for (const p of paths.flatMap((path) => (path ? path.split(sep) : []))) {
 		if (p && !seen.has(p)) {
 			seen.add(p);
 			parts.push(p);

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"`.