@ottocode/sdk 0.1.260 → 0.1.261

package/package.json

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

package/src/config/src/manager.ts

@@ -20,9 +20,9 @@ import {
 	joinPath,
 } from './paths.ts';
 import {
-	providerIds,
 	readEnvKey,
 	setEnvKey,
+	isBuiltInProviderId,
 } from '../../providers/src/index.ts';
 
 export type Scope = 'global' | 'local';
@@ -45,7 +45,7 @@ export async function isAuthorized(
 	provider: ProviderId,
 	projectRoot?: string,
 ): Promise<boolean> {
-	if (!providerIds.includes(provider)) return false;
+	if (!isBuiltInProviderId(provider)) return false;
 	if (readEnvKey(provider)) return true;
 	const { auth } = await read(projectRoot);
 	const info = auth[provider];
@@ -59,7 +59,7 @@ export async function ensureEnv(
 	provider: ProviderId,
 	projectRoot?: string,
 ): Promise<void> {
-	if (!providerIds.includes(provider)) return;
+	if (!isBuiltInProviderId(provider)) return;
 	if (readEnvKey(provider)) return;
 	const { auth } = await read(projectRoot);
 	const stored = auth[provider];

package/src/core/src/index.ts

@@ -32,6 +32,8 @@ export type { ProviderId, ModelInfo } from '../../types/src/index.ts';
 export { discoverProjectTools } from './tools/loader';
 export type { DiscoveredTool, DiscoverResult } from './tools/loader';
 export { setTerminalManager, getTerminalManager } from './tools/loader';
+export { shellExecutorContext } from './tools/builtin/shell';
+export type { ShellExecutor } from './tools/builtin/shell';
 
 // Tool error handling utilities
 export {

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

@@ -1,4 +1,5 @@
 import { tool, type Tool } from 'ai';
+import { AsyncLocalStorage } from 'node:async_hooks';
 import { spawn } from 'node:child_process';
 import { z } from 'zod/v3';
 import DESCRIPTION from './shell.txt' with { type: 'text' };
@@ -52,10 +53,23 @@ type ShellStreamChunk =
 			channel: 'output';
 			delta: string;
 	  }
+	| {
+			channel: 'terminal';
+			terminalId: string;
+	  }
 	| {
 			result: ShellResult;
 	  };
 
+export type ShellExecutorInput = ShellInput & { cwd: string };
+
+export type ShellExecutor = (
+	input: ShellExecutorInput,
+	options?: { abortSignal?: AbortSignal },
+) => AsyncIterable<ShellStreamChunk> | ShellResult | Promise<ShellResult>;
+
+export const shellExecutorContext = new AsyncLocalStorage<ShellExecutor>();
+
 const shellInputSchema = z
 	.object({
 		cmd: z
@@ -111,6 +125,13 @@ export function buildShellTool(projectRoot: string): {
 
 			const absCwd = resolveSafePath(projectRoot, cwd || '.');
 			const finalCmd = injectCoAuthorIntoGitCommit(cmd);
+			const shellExecutor = shellExecutorContext.getStore();
+			if (shellExecutor) {
+				return shellExecutor(
+					{ cmd: finalCmd, cwd: absCwd, allowNonZeroExit, timeout },
+					options,
+				) as AsyncIterable<ShellStreamChunk> | ShellResult;
+			}
 
 			const proc = spawn(finalCmd, {
 				cwd: absCwd,

package/src/index.ts

@@ -277,6 +277,9 @@ export type { ProviderName, ModelConfig } from './core/src/index.ts';
 export { discoverProjectTools } from './core/src/index.ts';
 export type { DiscoveredTool, DiscoverResult } from './core/src/index.ts';
 export { setTerminalManager, getTerminalManager } from './core/src/index.ts';
+export { shellExecutorContext } from './core/src/index.ts';
+export type { ShellExecutor } from './core/src/index.ts';
+export { createToolError } from './core/src/index.ts';
 export { buildFsTools } from './core/src/index.ts';
 export { buildGitTools } from './core/src/index.ts';
 export {

package/src/providers/src/ollama-discovery.ts

@@ -1,5 +1,9 @@
 import type { ModelInfo } from '../../types/src/index.ts';
 
+type FetchHeaders = NonNullable<
+	Parameters<typeof globalThis.fetch>[1]
+>['headers'];
+
 export type DiscoverOllamaOptions = {
 	baseURL: string;
 	apiKey?: string;
@@ -80,7 +84,7 @@ export async function discoverOllamaModels(
 async function discoverSingleOllamaModel(
 	fetchImpl: typeof globalThis.fetch,
 	baseURL: string,
-	headers: HeadersInit | undefined,
+	headers: FetchHeaders | undefined,
 	id: string,
 ): Promise<ModelInfo> {
 	try {
@@ -143,7 +147,7 @@ function extractContextLength(
 	return undefined;
 }
 
-function buildHeaders(apiKey?: string): HeadersInit | undefined {
+function buildHeaders(apiKey?: string): FetchHeaders | undefined {
 	if (!apiKey) return undefined;
 	return { Authorization: `Bearer ${apiKey}` };
 }

package/src/providers/src/utils.ts

@@ -7,6 +7,7 @@ import type {
 	ModelOwner,
 } from '../../types/src/index.ts';
 import { filterModelsForAuthType } from './oauth-models.ts';
+import { isBuiltInProviderId } from './registry.ts';
 
 export const providerIds = Object.keys(catalog) as BuiltInProviderId[];
 
@@ -106,12 +107,12 @@ export function getModelNpmBinding(
 	provider: ProviderId,
 	model: string,
 ): string | undefined {
-	const entry = catalog[provider];
+	const entry = isBuiltInProviderId(provider) ? catalog[provider] : undefined;
 	const modelInfo = getProviderModels(provider).find((m) => m.id === model);
 	if (modelInfo?.provider?.npm) return modelInfo.provider.npm;
 	if (entry?.npm) return entry.npm;
 
-	for (const key of Object.keys(catalog) as ProviderId[]) {
+	for (const key of Object.keys(catalog) as BuiltInProviderId[]) {
 		const e = catalog[key];
 		const m = getProviderModels(key).find((x) => x.id === model);
 		if (m?.provider?.npm) return m.provider.npm;
@@ -233,7 +234,7 @@ export function getModelInfo(
 	provider: ProviderId,
 	model: string,
 ): ModelInfo | undefined {
-	const entry = catalog[provider];
+	const entry = isBuiltInProviderId(provider) ? catalog[provider] : undefined;
 	if (!entry) return undefined;
 	return getProviderModels(provider).find((m) => m.id === model);
 }
@@ -241,7 +242,7 @@ export function getModelInfo(
 function getProviderModels(provider: ProviderId): ModelInfo[] {
 	return (
 		getCachedProviderCatalogEntry(provider)?.models ??
-		catalog[provider]?.models ??
+		(isBuiltInProviderId(provider) ? catalog[provider]?.models : undefined) ??
 		[]
 	);
 }

package/src/providers/src/validate.ts

@@ -4,6 +4,7 @@ import type { OttoConfig, ProviderId } from '../../types/src/index.ts';
 import {
 	getProviderDefinition,
 	hasConfiguredModel,
+	isBuiltInProviderId,
 	providerAllowsAnyModel,
 } from './registry.ts';
 
@@ -64,12 +65,13 @@ export function validateProviderModel(
 	}
 
 	const p = providerId;
-	if (!catalog[p] && !getCachedProviderCatalogEntry(p)) {
+	const builtInEntry = isBuiltInProviderId(p) ? catalog[p] : undefined;
+	if (!builtInEntry && !getCachedProviderCatalogEntry(p)) {
 		throw new Error(`Provider not supported: ${providerId}`);
 	}
 	const models =
-		getCachedProviderCatalogEntry(p)?.models ?? catalog[p]?.models ?? [];
-	const entry = models.find((m) => m.id === modelId);
+		getCachedProviderCatalogEntry(p)?.models ?? builtInEntry?.models ?? [];
+	const entry = models.find((m: { id: string }) => m.id === modelId);
 	if (!entry) {
 		throwModelNotFound(providerId, modelId, models);
 	}

package/src/types/src/index.ts

@@ -21,6 +21,7 @@ export type {
 	PathConfig,
 	ProviderSettingsEntry,
 	ProviderSettings,
+	SkillSettings,
 	OttoConfig,
 	ToolApprovalMode,
 	ReasoningLevel,