@ottocode/sdk 0.1.304 → 0.1.305

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ottocode/sdk",
-	"version": "0.1.304",
+	"version": "0.1.305",
 	"description": "AI agent SDK for building intelligent assistants - tree-shakable and comprehensive",
 	"author": "nitishxyz",
 	"license": "MIT",
@@ -105,7 +105,7 @@
 		"@ai-sdk/provider": "3.0.10",
 		"@ai-sdk/provider-utils": "4.0.27",
 		"@ai-sdk/xai": "3.0.93",
-		"@ff-labs/fff-bun": "0.9.3",
+		"@ff-labs/fff-bun": "0.9.4",
 		"@modelcontextprotocol/sdk": "1.27.1",
 		"@openauthjs/openauth": "0.4.3",
 		"@openrouter/ai-sdk-provider": "1.5.4",

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

@@ -1,5 +1,5 @@
 import { join } from 'node:path';
-import { spawn, execSync } from 'node:child_process';
+import { spawn, execFileSync } from 'node:child_process';
 import { homedir } from 'node:os';
 import {
 	clearCachedBinaries,
@@ -10,7 +10,10 @@ import { fileExists, isExecutable } from './bin-manager/filesystem.ts';
 import { getAgiBinDir, getBinaryFileName } from './bin-manager/paths.ts';
 import { extractFromVendor } from './bin-manager/vendor.ts';
 
-let cachedLoginPath: string | null = null;
+let cachedLoginPath: {
+	key: string;
+	path: string | null;
+} | null = null;
 
 export { getAgiBinDir } from './bin-manager/paths.ts';
 
@@ -64,15 +67,61 @@ export function clearBinaryCache(): void {
 	clearCachedBinaries();
 }
 
-function getLoginShellPath(): string | null {
-	if (cachedLoginPath !== null) return cachedLoginPath;
+export function getUserShell(): string {
+	if (process.platform === 'win32') return process.env.COMSPEC || 'cmd.exe';
+	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): {
+	command: string;
+	args: string[];
+	env: NodeJS.ProcessEnv;
+} {
+	const env = { ...process.env, PATH: getAugmentedPath() };
 	if (process.platform === 'win32') {
-		cachedLoginPath = process.env.PATH || '';
-		return cachedLoginPath;
+		return {
+			command: getUserShell(),
+			args: ['/d', '/s', '/c', cmd],
+			env,
+		};
 	}
 
+	const command = getUserShell();
+	return {
+		command,
+		args: [getInteractiveShellFlag(command), 'eval "$OTTO_SHELL_COMMAND"'],
+		env: { ...env, OTTO_SHELL_COMMAND: cmd },
+	};
+}
+
+function getLoginShellPath(): string | null {
 	const home = process.env.HOME || homedir();
+	const userShell = getUserShell();
+	const cacheKey = [home, userShell, process.env.PATH || ''].join('\0');
+	if (cachedLoginPath?.key === cacheKey) return cachedLoginPath.path;
+
+	if (process.platform === 'win32') {
+		cachedLoginPath = { key: cacheKey, path: process.env.PATH || '' };
+		return cachedLoginPath.path;
+	}
+
 	const shellCandidates = [
 		process.env.SHELL,
 		'/bin/zsh',
@@ -82,21 +131,28 @@ function getLoginShellPath(): string | null {
 
 	for (const shell of shellCandidates) {
 		try {
-			const result = execSync(`${shell} -ilc 'echo "___PATH___:$PATH"'`, {
+			const rcBootstrap = getShellRcBootstrap(shell);
+			const pathCommand = `${rcBootstrap ? `${rcBootstrap}\n` : ''}echo "___PATH___:$PATH"`;
+			const result = execFileSync(shell, ['-ilc', pathCommand], {
 				timeout: 5000,
 				stdio: ['ignore', 'pipe', 'ignore'],
-				env: { HOME: home, USER: process.env.USER || '', SHELL: shell },
+				env: {
+					...process.env,
+					HOME: home,
+					USER: process.env.USER || '',
+					SHELL: shell,
+				},
 			});
 			const output = result.toString();
 			const match = output.match(/___PATH___:(.*)/);
 			if (match?.[1]?.trim()) {
-				cachedLoginPath = match[1].trim();
-				return cachedLoginPath;
+				cachedLoginPath = { key: cacheKey, path: match[1].trim() };
+				return cachedLoginPath.path;
 			}
 		} catch {}
 	}
 
-	cachedLoginPath = null;
+	cachedLoginPath = { key: cacheKey, path: null };
 	return null;
 }
 

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

@@ -3,7 +3,7 @@ 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' };
-import { getAugmentedPath } from '../bin-manager.ts';
+import { getShellExecutionConfig } from '../bin-manager.ts';
 import { createToolError, type ToolResponse } from '../error.ts';
 import { injectCoAuthorIntoGitCommit } from './git-identity.ts';
 
@@ -47,17 +47,6 @@ export type ShellOutputMode = 'auto' | 'full' | 'tail';
 const DEFAULT_TAIL_LINES = 100;
 const DEFAULT_MAX_OUTPUT_BYTES = 128_000;
 
-function looksLikeRepositorySearchCommand(cmd: string): boolean {
-	const normalized = cmd.replace(/\s+/g, ' ').trim();
-	return (
-		/(^|[;&|()]\s*)(rg|ripgrep)(\s|$)/.test(normalized) ||
-		/(^|[;&|()]\s*)grep\s+.*\s(-R|-r|--recursive)(\s|$)/.test(normalized) ||
-		/(^|[;&|()]\s*)find\s+(\.|\.\/|\$PWD|\S*\/).*(-name|-iname|-path|-type)/.test(
-			normalized,
-		)
-	);
-}
-
 type CompactTextResult = {
 	text: string;
 	truncated: boolean;
@@ -147,7 +136,9 @@ const shellInputSchema = z
 	.object({
 		cmd: z
 			.string()
-			.describe('Non-interactive shell command to run (bash -c <cmd>)'),
+			.describe(
+				'Non-interactive shell command to run using the user shell with login/interactive startup loaded',
+			),
 		cwd: z
 			.string()
 			.default('.')
@@ -231,18 +222,6 @@ export function buildShellTool(projectRoot: string): {
 				});
 			}
 
-			if (looksLikeRepositorySearchCommand(cmd)) {
-				return createToolError(
-					'This looks like repository discovery. Use the search tool for content/code search or glob for filename/path discovery.',
-					'validation',
-					{
-						cmd,
-						suggestion:
-							'Use search for file contents, or glob for file and path discovery.',
-					},
-				);
-			}
-
 			const absCwd = resolveSafePath(projectRoot, cwd || '.');
 			const finalCmd = injectCoAuthorIntoGitCommit(cmd);
 			const shellExecutor = shellExecutorContext.getStore();
@@ -261,11 +240,11 @@ export function buildShellTool(projectRoot: string): {
 				) as AsyncIterable<ShellStreamChunk> | ShellResult;
 			}
 
-			const proc = spawn(finalCmd, {
+			const shellConfig = getShellExecutionConfig(finalCmd);
+			const proc = spawn(shellConfig.command, shellConfig.args, {
 				cwd: absCwd,
-				shell: true,
 				stdio: ['ignore', 'pipe', 'pipe'],
-				env: { ...process.env, PATH: getAugmentedPath() },
+				env: shellConfig.env,
 				detached: true,
 			});
 

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

@@ -1,4 +1,4 @@
-- Execute a non-interactive shell command using `bash -lc`
+- Execute a non-interactive shell command using the user's shell with login/interactive startup loaded
 - Returns `stdout`, `stderr`, and `exitCode`
 - `cwd` is relative to the project root and sandboxed within it