@ottocode/sdk 0.1.245 → 0.1.247

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ottocode/sdk",
-	"version": "0.1.245",
+	"version": "0.1.247",
 	"description": "AI agent SDK for building intelligent assistants - tree-shakable and comprehensive",
 	"author": "nitishxyz",
 	"license": "MIT",
@@ -37,6 +37,10 @@
 			"import": "./src/core/src/tools/builtin/bash.ts",
 			"types": "./src/core/src/tools/builtin/bash.ts"
 		},
+		"./tools/builtin/shell": {
+			"import": "./src/core/src/tools/builtin/shell.ts",
+			"types": "./src/core/src/tools/builtin/shell.ts"
+		},
 		"./tools/builtin/finish": {
 			"import": "./src/core/src/tools/builtin/finish.ts",
 			"types": "./src/core/src/tools/builtin/finish.ts"
@@ -97,9 +101,10 @@
 		"@modelcontextprotocol/sdk": "^1.12",
 		"@openauthjs/openauth": "^0.4.3",
 		"@openrouter/ai-sdk-provider": "^1.2.0",
-		"@ottorouter/ai-sdk": "0.2.0",
+		"@ottorouter/ai-sdk": "0.2.1",
 		"@solana/web3.js": "^1.98.0",
 		"ai": "^6.0.0",
+		"ai-sdk-ollama": "^3.8.3",
 		"bs58": "^6.0.0",
 		"bun-pty": "^0.3.2",
 		"diff": "^8.0.2",

package/src/config/src/index.ts

@@ -13,6 +13,7 @@ const DEFAULT_PROVIDER_SETTINGS: OttoConfig['providers'] = {
 	openai: { enabled: false },
 	anthropic: { enabled: false },
 	google: { enabled: false },
+	'ollama-cloud': { enabled: false, baseURL: 'https://ollama.com' },
 	openrouter: { enabled: false },
 	opencode: { enabled: false },
 	copilot: { enabled: false },
@@ -64,6 +65,7 @@ export async function loadConfig(
 		projectRoot,
 		defaults: merged.defaults as OttoConfig['defaults'],
 		providers: merged.providers as OttoConfig['providers'],
+		skills: merged.skills as OttoConfig['skills'],
 		paths: {
 			dataDir,
 			dbPath,
@@ -129,6 +131,9 @@ export {
 	isAuthorized,
 	ensureEnv,
 	writeDefaults,
+	writeProviderSettings,
+	removeProviderSettings,
+	writeSkillSettings,
 	writeAuth,
 	removeAuth,
 } from './manager.ts';

package/src/config/src/manager.ts

@@ -6,6 +6,10 @@ import {
 	type ProviderId,
 	type AuthInfo,
 } from '../../auth/src/index.ts';
+import type {
+	ProviderSettingsEntry,
+	SkillSettings,
+} from '../../types/src/index.ts';
 import {
 	getGlobalConfigDir,
 	getGlobalConfigPath,
@@ -83,30 +87,8 @@ export async function writeDefaults(
 	}>,
 	projectRoot?: string,
 ) {
-	const root = projectRoot ? String(projectRoot) : process.cwd();
-
-	if (scope === 'local') {
-		const localDir = getLocalDataDir(root);
-		const localPath = joinPath(localDir, 'config.json');
-		const existing = await readJsonFile(localPath);
-		const prevDefaults =
-			existing && typeof existing.defaults === 'object'
-				? (existing.defaults as Record<string, unknown>)
-				: {};
-		const next = {
-			...existing,
-			defaults: { ...prevDefaults, ...updates },
-		};
-		try {
-			const { promises: fs } = await import('node:fs');
-			await fs.mkdir(localDir, { recursive: true }).catch(() => {});
-		} catch {}
-		await Bun.write(localPath, JSON.stringify(next, null, 2));
-		return;
-	}
-
-	const globalPath = getGlobalConfigPath();
-	const existing = await readJsonFile(globalPath);
+	const filePath = getConfigFilePath(scope, projectRoot);
+	const existing = await readJsonFile(filePath);
 	const prevDefaults =
 		existing && typeof existing.defaults === 'object'
 			? (existing.defaults as Record<string, unknown>)
@@ -115,12 +97,82 @@ export async function writeDefaults(
 		...existing,
 		defaults: { ...prevDefaults, ...updates },
 	};
-	const base = getGlobalConfigDir();
-	try {
-		const { promises: fs } = await import('node:fs');
-		await fs.mkdir(base, { recursive: true }).catch(() => {});
-	} catch {}
-	await Bun.write(globalPath, JSON.stringify(next, null, 2));
+	await writeConfigFile(filePath, next);
+}
+
+/**
+ * Persist provider settings for a built-in or custom provider entry.
+ */
+export async function writeProviderSettings(
+	scope: Scope,
+	provider: string,
+	updates: ProviderSettingsEntry,
+	projectRoot?: string,
+) {
+	const filePath = getConfigFilePath(scope, projectRoot);
+	const existing = await readJsonFile(filePath);
+	const prevProviders =
+		existing && typeof existing.providers === 'object'
+			? (existing.providers as Record<string, unknown>)
+			: {};
+	const previousEntry =
+		prevProviders[provider] && typeof prevProviders[provider] === 'object'
+			? (prevProviders[provider] as Record<string, unknown>)
+			: {};
+	const next = {
+		...existing,
+		providers: {
+			...prevProviders,
+			[provider]: { ...previousEntry, ...updates },
+		},
+	};
+	await writeConfigFile(filePath, next);
+}
+
+/**
+ * Remove a provider override or custom provider entry from config.
+ */
+export async function removeProviderSettings(
+	scope: Scope,
+	provider: string,
+	projectRoot?: string,
+) {
+	const filePath = getConfigFilePath(scope, projectRoot);
+	const existing = await readJsonFile(filePath);
+	if (!existing || typeof existing.providers !== 'object') return;
+	const providers = { ...(existing.providers as Record<string, unknown>) };
+	delete providers[provider];
+	const next = { ...existing, providers };
+	await writeConfigFile(filePath, next);
+}
+
+export async function writeSkillSettings(
+	scope: Scope,
+	updates: SkillSettings,
+	projectRoot?: string,
+) {
+	const filePath = getConfigFilePath(scope, projectRoot);
+	const existing = await readJsonFile(filePath);
+	const prevSkills =
+		existing && typeof existing.skills === 'object'
+			? (existing.skills as Record<string, unknown>)
+			: {};
+	const prevItems =
+		prevSkills.items && typeof prevSkills.items === 'object'
+			? (prevSkills.items as Record<string, unknown>)
+			: {};
+	const next = {
+		...existing,
+		skills: {
+			...prevSkills,
+			...updates,
+			items: {
+				...prevItems,
+				...(updates.items ?? {}),
+			},
+		},
+	};
+	await writeConfigFile(filePath, next);
 }
 
 export async function readDebugConfig(
@@ -183,6 +235,30 @@ async function readJsonFile(
 	}
 }
 
+function getConfigFilePath(scope: Scope, projectRoot?: string): string {
+	const root = projectRoot ? String(projectRoot) : process.cwd();
+	if (scope === 'local') {
+		const localDir = getLocalDataDir(root);
+		return joinPath(localDir, 'config.json');
+	}
+	return getGlobalConfigPath();
+}
+
+async function writeConfigFile(
+	filePath: string,
+	value: Record<string, unknown>,
+) {
+	const base =
+		filePath === getGlobalConfigPath()
+			? getGlobalConfigDir()
+			: filePath.slice(0, Math.max(0, filePath.lastIndexOf('/')));
+	try {
+		const { promises: fs } = await import('node:fs');
+		await fs.mkdir(base, { recursive: true }).catch(() => {});
+	} catch {}
+	await Bun.write(filePath, JSON.stringify(value, null, 2));
+}
+
 export async function writeAuth(
 	provider: ProviderId,
 	info: AuthInfo,

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

@@ -1,12 +1,14 @@
 import { openai, createOpenAI } from '@ai-sdk/openai';
 import { anthropic, createAnthropic } from '@ai-sdk/anthropic';
 import { google, createGoogleGenerativeAI } from '@ai-sdk/google';
+import { createOllama } from 'ai-sdk-ollama';
 import { createOpenRouter } from '@openrouter/ai-sdk-provider';
 import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
 import {
 	catalog,
 	createOttoRouterModel,
 	createOpenAIOAuthModel,
+	normalizeOllamaBaseURL,
 } from '../../../providers/src/index.ts';
 import { createCopilotModel } from '../../../providers/src/copilot-client.ts';
 import type { OAuth } from '../../../types/src/index.ts';
@@ -32,13 +34,15 @@ export type ProviderName =
 	| 'openai'
 	| 'anthropic'
 	| 'google'
+	| 'ollama-cloud'
 	| 'openrouter'
 	| 'opencode'
 	| 'copilot'
 	| 'ottorouter'
 	| 'zai'
 	| 'zai-coding'
-	| 'moonshot';
+	| 'moonshot'
+	| 'minimax';
 
 export type ModelConfig = {
 	apiKey?: string;
@@ -96,6 +100,20 @@ export async function resolveModel(
 		return google(model);
 	}
 
+	if (provider === 'ollama-cloud') {
+		const entry = catalog[provider];
+		const apiKey = config.apiKey || process.env.OLLAMA_API_KEY || '';
+		const headers = apiKey ? { Authorization: `Bearer ${apiKey}` } : undefined;
+		const baseURL = normalizeOllamaBaseURL(
+			config.baseURL || entry?.api || 'https://ollama.com',
+		);
+		const instance = createOllama({
+			baseURL,
+			headers,
+		});
+		return instance(model);
+	}
+
 	if (provider === 'openrouter') {
 		const apiKey = config.apiKey || process.env.OPENROUTER_API_KEY || '';
 		const openrouter = createOpenRouter({ apiKey });
@@ -233,6 +251,15 @@ export async function resolveModel(
 		return instance(model);
 	}
 
+	if (provider === 'minimax') {
+		const entry = catalog[provider];
+		const apiKey = config.apiKey || process.env.MINIMAX_API_KEY || '';
+		const baseURL =
+			config.baseURL || entry?.api || 'https://api.minimax.io/anthropic/v1';
+		const instance = createAnthropic({ apiKey, baseURL });
+		return instance(model);
+	}
+
 	throw new Error(`Unsupported provider: ${provider}`);
 }
 

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

@@ -1,266 +1 @@
-import { tool, type Tool } from 'ai';
-import { spawn } from 'node:child_process';
-import { z } from 'zod/v3';
-import DESCRIPTION from './bash.txt' with { type: 'text' };
-import { getAugmentedPath } from '../bin-manager.ts';
-import { createToolError, type ToolResponse } from '../error.ts';
-import { injectCoAuthorIntoGitCommit } from './git-identity.ts';
-
-function normalizePath(p: string) {
-	const normalized = p.replace(/\\/g, '/');
-	const driveMatch = normalized.match(/^([A-Za-z]):\//);
-	const drivePrefix = driveMatch ? `${driveMatch[1]}:` : '';
-	const rest = driveMatch ? normalized.slice(2) : normalized;
-	const parts = rest.split('/');
-	const stack: string[] = [];
-	for (const part of parts) {
-		if (!part || part === '.') continue;
-		if (part === '..') stack.pop();
-		else stack.push(part);
-	}
-	if (drivePrefix) return `${drivePrefix}/${stack.join('/')}`;
-	return `/${stack.join('/')}`;
-}
-
-function resolveSafePath(projectRoot: string, p: string) {
-	const root = normalizePath(projectRoot);
-	const abs = normalizePath(`${root}/${p || '.'}`);
-	if (!(abs === root || abs.startsWith(`${root}/`))) {
-		throw new Error(`cwd escapes project root: ${p}`);
-	}
-	return abs;
-}
-
-function killProcessTree(pid: number) {
-	try {
-		process.kill(-pid, 'SIGTERM');
-	} catch {
-		try {
-			process.kill(pid, 'SIGTERM');
-		} catch {}
-	}
-}
-
-type BashResult = ToolResponse<{
-	exitCode: number;
-	stdout: string;
-	stderr: string;
-}>;
-
-type BashStreamChunk =
-	| {
-			channel: 'output';
-			delta: string;
-	  }
-	| {
-			result: BashResult;
-	  };
-
-export function buildBashTool(projectRoot: string): {
-	name: string;
-	tool: Tool;
-} {
-	// biome-ignore lint/suspicious/noExplicitAny: AI SDK tool typings do not model async-iterable execute results yet.
-	const bash = tool({
-		description: DESCRIPTION,
-		inputSchema: z
-			.object({
-				cmd: z.string().describe('Shell command to run (bash -c <cmd>)'),
-				cwd: z
-					.string()
-					.default('.')
-					.describe('Working directory relative to project root'),
-				allowNonZeroExit: z
-					.boolean()
-					.optional()
-					.default(false)
-					.describe('If true, do not throw on non-zero exit'),
-				timeout: z
-					.number()
-					.optional()
-					.default(300000)
-					.describe('Timeout in milliseconds (default: 300000 = 5 minutes)'),
-			})
-			.strict(),
-		execute(
-			{
-				cmd,
-				cwd,
-				allowNonZeroExit,
-				timeout = 300000,
-			}: {
-				cmd: string;
-				cwd?: string;
-				allowNonZeroExit?: boolean;
-				timeout?: number;
-			},
-			options?: { abortSignal?: AbortSignal },
-		): AsyncIterable<BashStreamChunk> | BashResult {
-			const abortSignal = options?.abortSignal;
-
-			if (abortSignal?.aborted) {
-				return createToolError('Command aborted before execution', 'abort', {
-					cmd,
-				});
-			}
-
-			const absCwd = resolveSafePath(projectRoot, cwd || '.');
-			const finalCmd = injectCoAuthorIntoGitCommit(cmd);
-
-			const proc = spawn(finalCmd, {
-				cwd: absCwd,
-				shell: true,
-				stdio: ['ignore', 'pipe', 'pipe'],
-				env: { ...process.env, PATH: getAugmentedPath() },
-				detached: true,
-			});
-
-			let stdout = '';
-			let stderr = '';
-			let didTimeout = false;
-			let didAbort = false;
-			let settled = false;
-			let done = false;
-			let timeoutId: ReturnType<typeof setTimeout> | null = null;
-			const queue: BashStreamChunk[] = [];
-			let notify: (() => void) | null = null;
-
-			const wake = () => {
-				if (!notify) return;
-				notify();
-				notify = null;
-			};
-
-			const pushDelta = (text: string) => {
-				if (!text) return;
-				queue.push({ channel: 'output', delta: text });
-				wake();
-			};
-
-			const settle = (result: BashResult) => {
-				if (settled) return;
-				settled = true;
-				if (timeoutId) clearTimeout(timeoutId);
-				if (abortSignal) {
-					abortSignal.removeEventListener('abort', onAbort);
-				}
-				queue.push({ result });
-				done = true;
-				wake();
-			};
-
-			const onAbort = () => {
-				if (settled) return;
-				didAbort = true;
-				if (proc.pid) killProcessTree(proc.pid);
-				else proc.kill('SIGTERM');
-			};
-
-			if (abortSignal) {
-				abortSignal.addEventListener('abort', onAbort, { once: true });
-			}
-
-			if (timeout > 0) {
-				timeoutId = setTimeout(() => {
-					didTimeout = true;
-					if (proc.pid) killProcessTree(proc.pid);
-					else proc.kill();
-				}, timeout);
-			}
-
-			proc.stdout?.on('data', (chunk) => {
-				const text = chunk.toString();
-				stdout += text;
-				pushDelta(text);
-			});
-
-			proc.stderr?.on('data', (chunk) => {
-				const text = chunk.toString();
-				stderr += text;
-				pushDelta(text);
-			});
-
-			proc.on('close', (exitCode) => {
-				if (didAbort) {
-					settle(
-						createToolError(`Command aborted by user: ${cmd}`, 'abort', {
-							cmd,
-							stdout,
-							stderr,
-						}),
-					);
-					return;
-				}
-
-				if (didTimeout) {
-					settle(
-						createToolError(
-							`Command timed out after ${timeout}ms: ${cmd}`,
-							'timeout',
-							{
-								parameter: 'timeout',
-								value: timeout,
-								stdout,
-								stderr,
-								suggestion: 'Increase timeout or optimize the command',
-							},
-						),
-					);
-					return;
-				}
-
-				if (exitCode !== 0 && !allowNonZeroExit) {
-					const errorDetail = stderr.trim() || stdout.trim() || '';
-					const errorMsg = `Command failed with exit code ${exitCode}${errorDetail ? `\n\n${errorDetail}` : ''}`;
-					settle(
-						createToolError(errorMsg, 'execution', {
-							exitCode,
-							stdout,
-							stderr,
-							cmd,
-							suggestion: 'Check command syntax or use allowNonZeroExit: true',
-						}),
-					);
-					return;
-				}
-
-				settle({
-					ok: true,
-					exitCode: exitCode ?? 0,
-					stdout,
-					stderr,
-				});
-			});
-
-			proc.on('error', (err) => {
-				settle(
-					createToolError(
-						`Command execution failed: ${err.message}`,
-						'execution',
-						{
-							cmd,
-							originalError: err.message,
-						},
-					),
-				);
-			});
-
-			const stream = async function* (): AsyncGenerator<BashStreamChunk> {
-				while (!done || queue.length > 0) {
-					if (queue.length === 0) {
-						await new Promise<void>((resolve) => {
-							notify = resolve;
-						});
-					}
-					while (queue.length > 0) {
-						const chunk = queue.shift();
-						if (chunk) yield chunk;
-					}
-				}
-			};
-
-			return stream();
-		},
-	} as any);
-	return { name: 'bash', tool: bash };
-}
+export { buildShellTool, buildShellTool as buildBashTool } from './shell.ts';

package/src/core/src/tools/builtin/fs/edit-shared.ts

@@ -34,7 +34,7 @@ export function applyStringEdit(
 ): { content: string; occurrences: number } {
 	if (oldString.length === 0) {
 		throw new Error(
-			'oldString must not be empty. Use write to create files or apply_patch for structural insertions.',
+			'oldString must not be empty. Use write to create files or a structural editing tool for larger insertions.',
 		);
 	}
 	if (oldString === newString) {

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

@@ -1,9 +1,9 @@
 Replace an exact text block in an existing file.
 
-Use this for targeted edits instead of apply_patch whenever possible.
+Use this for targeted edits instead of structural patch-style editing whenever possible.
 
 Rules:
 - You must read the file first in the current session before editing it.
 - `oldString` must match the file exactly, including whitespace.
 - If `oldString` appears multiple times, provide more context or set `replaceAll: true`.
-- Use `write` for new files and `apply_patch` for structural multi-file diffs.
+- Use `write` for new files and a structural editing tool for multi-file diffs when that capability exists.

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

@@ -6,6 +6,6 @@
 Usage tips:
 - Use for creating NEW files
 - Use when replacing >70% of a file's content (almost complete rewrite)
-- NEVER use for partial/targeted edits - use edit/multiedit first, or apply_patch for structural changes
+- NEVER use for partial/targeted edits - use the dedicated exact-editing tools first, or a structural editing tool for larger changes when available
 - Using write for partial edits wastes output tokens and risks hallucinating unchanged parts
 - Prefer idempotent writes by providing the full intended content when you do use write