@ottocode/server 0.1.246 → 0.1.247

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ottocode/server",
-	"version": "0.1.246",
+	"version": "0.1.247",
 	"description": "HTTP API server for ottocode",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -49,8 +49,8 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@ottocode/database": "0.1.246",
-		"@ottocode/sdk": "0.1.246",
+		"@ottocode/database": "0.1.247",
+		"@ottocode/sdk": "0.1.247",
 		"ai-sdk-ollama": "^3.8.3",
 		"drizzle-orm": "^0.44.5",
 		"hono": "^4.9.9",

package/src/presets.ts

@@ -68,7 +68,7 @@ export const BUILTIN_TOOLS = [
 	'tree',
 	'pwd',
 	'cd',
-	'bash',
+	'shell',
 	'terminal',
 	'ripgrep',
 	'glob',

package/src/runtime/agent/registry.ts

@@ -126,7 +126,7 @@ const defaultToolExtras: Record<string, string[]> = {
 		'write',
 		'ls',
 		'tree',
-		'bash',
+		'shell',
 		'update_todos',
 		'glob',
 		'ripgrep',
@@ -144,7 +144,7 @@ const defaultToolExtras: Record<string, string[]> = {
 		'write',
 		'ls',
 		'tree',
-		'bash',
+		'shell',
 		'ripgrep',
 		'glob',
 		'websearch',
@@ -158,7 +158,7 @@ const defaultToolExtras: Record<string, string[]> = {
 		'write',
 		'ls',
 		'tree',
-		'bash',
+		'shell',
 		'update_todos',
 		'glob',
 		'ripgrep',

package/src/runtime/agent/runner-setup.ts

@@ -122,6 +122,14 @@ const MODEL_FAMILY_EDIT_TOOL_POLICY_AGENTS = new Set([
 	'init',
 ]);
 
+function normalizeToolName(toolName: string): string {
+	return toolName === 'bash' ? 'shell' : toolName;
+}
+
+function normalizeToolNames(toolNames: string[]): string[] {
+	return Array.from(new Set(toolNames.map(normalizeToolName)));
+}
+
 export function applyModelFamilyEditToolPolicy(
 	agent: string,
 	tools: string[],
@@ -129,6 +137,7 @@ export function applyModelFamilyEditToolPolicy(
 	model: string,
 	cfg?: OttoConfig,
 ): string[] {
+	tools = normalizeToolNames(tools);
 	if (!MODEL_FAMILY_EDIT_TOOL_POLICY_AGENTS.has(agent)) return tools;
 
 	const family = cfg
@@ -328,7 +337,10 @@ export async function setupRunner(opts: RunOpts): Promise<SetupResult> {
 		opts.provider,
 		opts.model,
 	);
-	const allowedNames = new Set([...allowedToolNames, 'finish']);
+	const allowedNames = new Set([
+		...normalizeToolNames(allowedToolNames),
+		'finish',
+	]);
 	const gated = allTools.filter(
 		(tool) => allowedNames.has(tool.name) || tool.name === 'load_mcp_tools',
 	);

package/src/runtime/tools/approval.ts

@@ -3,6 +3,7 @@ import { publish } from '../../events/bus.ts';
 export type ToolApprovalMode = 'auto' | 'dangerous' | 'all' | 'yolo';
 
 export const DANGEROUS_TOOLS = new Set([
+	'shell',
 	'bash',
 	'edit',
 	'multiedit',

package/src/runtime/tools/guards.ts

@@ -17,8 +17,9 @@ export function guardToolCall(
 	const a = (args ?? {}) as Record<string, unknown>;
 
 	switch (toolName) {
+		case 'shell':
 		case 'bash':
-			return guardBashCommand(String(a.cmd ?? ''));
+			return guardShellCommand(String(a.cmd ?? ''));
 		case 'terminal':
 			return guardTerminal(a);
 		case 'read':
@@ -30,7 +31,7 @@ export function guardToolCall(
 	}
 }
 
-function guardBashCommand(cmd: string): GuardAction {
+function guardShellCommand(cmd: string): GuardAction {
 	const n = cmd.trim();
 	if (!n) return { type: 'allow' };
 
@@ -104,7 +105,7 @@ function checkApprovalCommand(cmd: string): string | null {
 function guardTerminal(args: Record<string, unknown>): GuardAction {
 	const op = String(args.operation ?? '');
 	if (op === 'start' && typeof args.command === 'string') {
-		return guardBashCommand(args.command);
+		return guardShellCommand(args.command);
 	}
 	return { type: 'allow' };
 }

package/src/runtime/tools/mapping.ts

@@ -30,7 +30,8 @@ export const CANONICAL_TO_PASCAL: Record<string, string> = {
 	ripgrep: 'Grep',
 
 	// Execution
-	bash: 'Bash',
+	shell: 'Shell',
+	bash: 'Shell',
 	terminal: 'Terminal',
 
 	// Git operations
@@ -70,7 +71,8 @@ export const PASCAL_TO_CANONICAL: Record<string, string> = {
 	Grep: 'ripgrep', // Maps back to ripgrep (primary search tool)
 
 	// Execution
-	Bash: 'bash',
+	Shell: 'shell',
+	Bash: 'shell',
 	Terminal: 'terminal',
 
 	// Git operations

package/src/tools/adapter.ts

@@ -134,8 +134,8 @@ export function adaptTools(
 	const stepStates = ctx.stepExecution.states;
 
 	// Anthropic allows max 4 cache_control blocks
-	// Cache only the most frequently used tools: read, write, bash
-	const cacheableTools = new Set(['read', 'write', 'bash']);
+	// Cache only the most frequently used tools: read, write, shell
+	const cacheableTools = new Set(['read', 'write', 'shell']);
 	let cachedToolCount = 0;
 
 	for (const { name: canonicalName, tool } of tools) {
@@ -502,7 +502,7 @@ export function adaptTools(
 							} as ToolExecuteInput;
 							// biome-ignore lint/suspicious/noExplicitAny: AI SDK types are complex
 							res = base.execute?.(nextInput, options as any);
-						} else if (name === 'bash') {
+						} else if (name === 'shell' || name === 'bash') {
 							const needsCwd =
 								!input ||
 								typeof (input as Record<string, unknown>).cwd !== 'string';