fix: add comprehensive parameter validation and error handling for all tools

src/tool.ts

@@ -134,14 +134,8 @@ export class Tools {
         isError: true,
       };
     }
-    // // @ts-expect-error
-    // const result = validateToolParams(tool.parameters, args);
-    // if (!result.success) {
-    //   return {
-    //     llmContent: `Invalid tool parameters: ${result.error}`,
-    //     isError: true,
-    //   };
-    // }
+
+    // Parse JSON arguments
     let argsObj: any;
     try {
       argsObj = JSON.parse(args);
@@ -151,6 +145,32 @@ export class Tools {
         isError: true,
       };
     }
+
+    // Validate parameters using Zod schema (skip for MCP tools)
+    const isMcpTool = toolName.startsWith('mcp__');
+    if (!isMcpTool) {
+      const { validateToolParams, sanitizeToolParams } = await import(
+        './utils/validateToolParams'
+      );
+
+      // Try to sanitize parameters first (auto-fix common issues)
+      argsObj = sanitizeToolParams(tool.parameters, argsObj);
+
+      // Validate after sanitization
+      const validationResult = validateToolParams(tool.parameters, argsObj);
+      if (!validationResult.success) {
+        // TODO: Add retry limit to prevent infinite loops when LLM repeatedly fails
+        // Current behavior: LLM will retry up to maxTurns (default 50) times
+        // Future improvement: Track consecutive identical parameter errors and fail fast after 3 attempts
+        // This should be implemented in loop.ts by detecting repeated tool+params failures
+        // Example: if (consecutiveSameErrors >= 3) { return 'repeated_tool_error' }
+        return {
+          llmContent: validationResult.error,
+          isError: true,
+        };
+      }
+    }
+
     return await tool.execute(argsObj);
   }
 

src/tools/askUserQuestion.ts

@@ -58,6 +58,10 @@ const AskUserQuestionInputSchema = z
   })
   .refine(
     (data) => {
+      // Defensive check: ensure questions is an array
+      if (!Array.isArray(data.questions)) {
+        return false;
+      }
       const questionTexts = data.questions.map((q) => q.question);
       return questionTexts.length === new Set(questionTexts).size;
     },
@@ -68,7 +72,14 @@ const AskUserQuestionInputSchema = z
   )
   .refine(
     (data) => {
+      // Defensive check: ensure questions is an array
+      if (!Array.isArray(data.questions)) {
+        return false;
+      }
       for (const question of data.questions) {
+        if (!question.options || !Array.isArray(question.options)) {
+          return false;
+        }
         const labels = question.options.map((o) => o.label);
         if (labels.length !== new Set(labels).size) {
           return false;

src/tools/bash.ts

@@ -654,7 +654,7 @@ Usage:
       if (!params.task_id || typeof params.task_id !== 'string') {
         return 'Read background task output';
       }
-      return `Read output from task: ${params.task_id}`;
+      return `Read output from task: ${String(params.task_id)}`;
     },
     execute: async ({ task_id }) => {
       const task = backgroundTaskManager.getTask(task_id);
@@ -713,7 +713,7 @@ Usage:
       if (!params.task_id || typeof params.task_id !== 'string') {
         return 'Terminate background task';
       }
-      return `Terminate task: ${params.task_id}`;
+      return `Terminate task: ${String(params.task_id)}`;
     },
     execute: async ({ task_id }) => {
       const task = backgroundTaskManager.getTask(task_id);
@@ -830,8 +830,14 @@ cd /foo/bar && pytest tests
       if (!params.command || typeof params.command !== 'string') {
         return 'No command provided';
       }
-      const command = params.command.trim();
-      return command.length > 100 ? `${command.substring(0, 97)}...` : command;
+      try {
+        const command = String(params.command).trim();
+        return command.length > 100
+          ? `${command.substring(0, 97)}...`
+          : command;
+      } catch (error) {
+        return 'Invalid command';
+      }
     },
     execute: async ({
       command,

src/tools/edit.ts

@@ -34,7 +34,16 @@ Usage:
       if (!params.file_path || typeof params.file_path !== 'string') {
         return 'No file path provided';
       }
-      return path.relative(cwd, params.file_path);
+      // Ensure cwd is a string to prevent .trim() errors in path.relative()
+      if (typeof cwd !== 'string') {
+        return params.file_path;
+      }
+      try {
+        return path.relative(cwd, params.file_path);
+      } catch (error) {
+        // Fallback if path.relative fails
+        return params.file_path;
+      }
     },
     execute: async ({ file_path, old_string, new_string, replace_all }) => {
       try {

src/tools/fetch.ts

@@ -25,7 +25,7 @@ Remembers:
       if (!params.url || typeof params.url !== 'string') {
         return 'No URL provided';
       }
-      return params.url;
+      return String(params.url);
     },
     execute: async ({ url, prompt }) => {
       try {

src/tools/glob.ts

@@ -23,7 +23,7 @@ Glob
       if (!params.pattern || typeof params.pattern !== 'string') {
         return 'No pattern provided';
       }
-      return params.pattern;
+      return String(params.pattern);
     },
     execute: async ({ pattern, path }) => {
       try {

src/tools/grep.ts

@@ -32,7 +32,7 @@ export function createGrepTool(opts: { cwd: string }) {
       if (!params.pattern || typeof params.pattern !== 'string') {
         return 'No pattern provided';
       }
-      return params.pattern;
+      return String(params.pattern);
     },
     execute: async ({ pattern, search_path, include, limit }) => {
       try {

src/tools/ls.ts

@@ -16,11 +16,20 @@ export function createLSTool(opts: { cwd: string }) {
     parameters: z.object({
       dir_path: z.string().describe('The path to the directory to list.'),
     }),
-    getDescription: ({ params }) => {
+    getDescription: ({ params, cwd }) => {
       if (!params.dir_path || typeof params.dir_path !== 'string') {
         return '.';
       }
-      return path.relative(opts.cwd, params.dir_path);
+      // Ensure cwd is a string to prevent .trim() errors in path.relative()
+      if (typeof cwd !== 'string') {
+        return params.dir_path;
+      }
+      try {
+        return path.relative(cwd, params.dir_path);
+      } catch (error) {
+        // Fallback if path.relative fails
+        return params.dir_path;
+      }
     },
     execute: async (params) => {
       const { dir_path } = params;

src/tools/read.ts

@@ -115,7 +115,16 @@ Usage:
       if (!params.file_path || typeof params.file_path !== 'string') {
         return 'No file path provided';
       }
-      return path.relative(cwd, params.file_path);
+      // Ensure cwd is a string to prevent .trim() errors in path.relative()
+      if (typeof cwd !== 'string') {
+        return params.file_path;
+      }
+      try {
+        return path.relative(cwd, params.file_path);
+      } catch (error) {
+        // Fallback if path.relative fails
+        return params.file_path;
+      }
     },
     execute: async ({ file_path, offset, limit }) => {
       try {

src/tools/write.ts

@@ -15,7 +15,16 @@ export function createWriteTool(opts: { cwd: string }) {
       if (!params.file_path || typeof params.file_path !== 'string') {
         return 'No file path provided';
       }
-      return path.relative(cwd, params.file_path);
+      // Ensure cwd is a string to prevent .trim() errors in path.relative()
+      if (typeof cwd !== 'string') {
+        return params.file_path;
+      }
+      try {
+        return path.relative(cwd, params.file_path);
+      } catch (error) {
+        // Fallback if path.relative fails
+        return params.file_path;
+      }
     },
     execute: async ({ file_path, content }) => {
       try {