@probelabs/probe 0.6.0-rc148 → 0.6.0-rc149

package/build/agent/ProbeAgent.js

@@ -920,9 +920,7 @@ Examples:
 </search>
 
 <extract>
-<path>src/config.js</path>
-<start_line>15</start_line>
-<end_line>25</end_line>
+<targets>src/config.js:15-25</targets>
 </extract>
 
 <attempt_completion>

package/build/agent/index.js

@@ -2888,7 +2888,7 @@ async function extract(options) {
   const hasInputFile = !!options.inputFile;
   const hasContent = options.content !== void 0 && options.content !== null;
   if (!hasFiles && !hasInputFile && !hasContent) {
-    throw new Error("Either files array, inputFile, or content must be provided");
+    throw new Error('Extract requires one of: "files" (array of file paths), "inputFile" (path to input file), or "content" (string/buffer for stdin)');
   }
   const binaryPath = await getBinaryPath(options.binaryOptions || {});
   const filteredOptions = { ...options };
@@ -7153,6 +7153,27 @@ var init_zod = __esm({
 });
 
 // src/tools/common.js
+function getValidParamsForTool(toolName) {
+  const schemaMap = {
+    search: searchSchema,
+    query: querySchema,
+    extract: extractSchema,
+    delegate: delegateSchema,
+    bash: bashSchema,
+    attempt_completion: attemptCompletionSchema
+  };
+  const schema = schemaMap[toolName];
+  if (!schema) {
+    return ["path", "directory", "pattern", "recursive", "includeHidden", "task", "files", "autoCommits", "result"];
+  }
+  if (toolName === "attempt_completion") {
+    return ["result"];
+  }
+  if (schema && schema._def && schema._def.shape) {
+    return Object.keys(schema._def.shape());
+  }
+  return [];
+}
 function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
   for (const toolName of validTools) {
     const openTag = `<${toolName}>`;
@@ -7171,35 +7192,8 @@ function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
       closeIndex
     );
     const params = {};
-    const commonParams = [
-      "query",
-      "file_path",
-      "line",
-      "end_line",
-      "path",
-      "recursive",
-      "includeHidden",
-      "max_results",
-      "maxResults",
-      "result",
-      "command",
-      "description",
-      "task",
-      "param",
-      "pattern",
-      "allow_tests",
-      "exact",
-      "maxTokens",
-      "language",
-      "input_content",
-      "context_lines",
-      "format",
-      "directory",
-      "autoCommits",
-      "files",
-      "targets"
-    ];
-    for (const paramName of commonParams) {
+    const validParams = getValidParamsForTool(toolName);
+    for (const paramName of validParams) {
       const paramOpenTag = `<${paramName}>`;
       const paramCloseTag = `</${paramName}>`;
       const paramOpenIndex = innerContent.indexOf(paramOpenTag);
@@ -7209,7 +7203,7 @@ function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
       let paramCloseIndex = innerContent.indexOf(paramCloseTag, paramOpenIndex + paramOpenTag.length);
       if (paramCloseIndex === -1) {
         let nextTagIndex = innerContent.length;
-        for (const nextParam of commonParams) {
+        for (const nextParam of validParams) {
           const nextOpenTag = `<${nextParam}>`;
           const nextIndex = innerContent.indexOf(nextOpenTag, paramOpenIndex + paramOpenTag.length);
           if (nextIndex !== -1 && nextIndex < nextTagIndex) {
@@ -7271,13 +7265,8 @@ var init_common = __esm({
     "use strict";
     init_zod();
     searchSchema = external_exports.object({
-      query: external_exports.string().describe("Search query with Elasticsearch syntax. Use + for important terms."),
-      path: external_exports.string().optional().default(".").describe('Path to search in. For dependencies use "go:github.com/owner/repo", "js:package_name", or "rust:cargo_name" etc.'),
-      allow_tests: external_exports.boolean().optional().default(false).describe("Allow test files in search results"),
-      exact: external_exports.boolean().optional().default(false).describe("Perform exact search without tokenization (case-insensitive)"),
-      maxResults: external_exports.number().optional().describe("Maximum number of results to return"),
-      maxTokens: external_exports.number().optional().default(1e4).describe("Maximum number of tokens to return"),
-      language: external_exports.string().optional().describe("Limit search to files of a specific programming language")
+      query: external_exports.string().describe("Search query with Elasticsearch syntax. Use quotes for exact matches, AND/OR for boolean logic, - for negation."),
+      path: external_exports.string().optional().default(".").describe('Path to search in. For dependencies use "go:github.com/owner/repo", "js:package_name", or "rust:cargo_name" etc.')
     });
     querySchema = external_exports.object({
       pattern: external_exports.string().describe("AST pattern to search for. Use $NAME for variable names, $$$PARAMS for parameter lists, etc."),
@@ -7286,13 +7275,8 @@ var init_common = __esm({
       allow_tests: external_exports.boolean().optional().default(false).describe("Allow test files in search results")
     });
     extractSchema = external_exports.object({
-      targets: external_exports.string().optional().describe("File paths or symbols to extract from. Can include line numbers, symbol names, or multiple space-separated targets"),
-      input_content: external_exports.string().optional().describe("Text content to extract file paths from"),
-      line: external_exports.number().optional().describe("Start line number to extract a specific code block"),
-      end_line: external_exports.number().optional().describe("End line number for extracting a range of lines"),
-      allow_tests: external_exports.boolean().optional().default(false).describe("Allow test files and test code blocks"),
-      context_lines: external_exports.number().optional().default(10).describe("Number of context lines to include"),
-      format: external_exports.string().optional().default("plain").describe("Output format (plain, markdown, json, xml, color, outline-xml, outline-diff)")
+      targets: external_exports.string().optional().describe('File paths or symbols to extract from. Formats: "file.js" (whole file), "file.js:42" (line 42), "file.js:10-20" (lines 10-20), "file.js#funcName" (symbol). Multiple targets separated by spaces.'),
+      input_content: external_exports.string().optional().describe("Text content to extract file paths from (alternative to targets)")
     });
     delegateSchema = external_exports.object({
       task: external_exports.string().describe("The task to delegate to a subagent. Be specific about what needs to be accomplished.")
@@ -7367,13 +7351,8 @@ You need to focus on main keywords when constructing the query, and always use e
 - Once data is returned, it's cached and won't return on next runs (this is expected behavior)
 
 Parameters:
-- query: (required) Search query with Elasticsearch syntax. You can use + for important terms, and - for negation.
-- path: (required) Path to search in. All dependencies located in /dep folder, under language sub folders, like this: "/dep/go/github.com/owner/repo", "/dep/js/package_name", or "/dep/rust/cargo_name" etc. YOU SHOULD ALWAYS provide FULL PATH when searching dependencies, including depency name.
-- allow_tests: (optional, default: false) Allow test files in search results (true/false).
-- exact: (optional, default: false) Perform exact pricise search. Use it when you already know function or struct name, or some other code block, and want exact match.
-- maxResults: (optional) Maximum number of results to return (number).
-- maxTokens: (optional, default: 10000) Maximum number of tokens to return (number).
-- language: (optional) Limit search to files of a specific programming language (e.g., 'rust', 'js', 'python', 'go' etc.).
+- query: (required) Search query with Elasticsearch syntax. Use quotes for exact matches ("functionName"), AND/OR for boolean logic, - for negation, + for important terms.
+- path: (optional, default: '.') Path to search in. All dependencies located in /dep folder, under language sub folders, like this: "/dep/go/github.com/owner/repo", "/dep/js/package_name", or "/dep/rust/cargo_name" etc.
 
 **Workflow:** Always start with search, then use extract for detailed context when needed.
 
@@ -7395,30 +7374,24 @@ User: How to calculate the total amount in the payments module?
 <search>
 <query>calculate AND payment</query>
 <path>src/utils</path>
-<allow_tests>false</allow_tests>
 </search>
 
 User: How do the user authentication and authorization work?
 <search>
-<query>+user and (authentification OR authroization OR authz)</query>
+<query>+user AND (authentication OR authorization OR authz)</query>
 <path>.</path>
-<allow_tests>true</allow_tests>
-<language>go</language>
 </search>
 
 User: Find all react imports in the project.
 <search>
-<query>import { react }</query>
+<query>"import" AND "react"</query>
 <path>.</path>
-<exact>true</exact>
-<language>js</language>
 </search>
 
-User: Find how decompoud library works?
+User: Find how decompound library works?
 <search>
-<query>import { react }</query>
+<query>decompound</query>
 <path>/dep/rust/decompound</path>
-<language>rust</language>
 </search>
 
 </examples>
@@ -7453,11 +7426,9 @@ Full file extraction should be the LAST RESORT! Always prefer search.
 **Session Awareness:** Reuse context from previous tool calls. Don't re-extract the same symbols you already have.
 
 Parameters:
-- targets: (required) File paths or symbols to extract from. Can include line numbers, symbol names, or multiple space-separated targets (e.g., 'src/main.rs:10-20', 'src/utils.js#myFunction').
-  For multiple extractions: 'session.rs#AuthService.login auth.rs:2-100 config.rs#DatabaseConfig'
-- line: (optional) Start line number to extract a specific code block. Use with end_line for ranges.
-- end_line: (optional) End line number for extracting a range of lines.
-- allow_tests: (optional, default: false) Allow test files and test code blocks (true/false).
+- targets: (required) File paths or symbols to extract from. Formats: "file.js" (whole file), "file.js:42" (code block at line 42), "file.js:10-20" (lines 10-20), "file.js#funcName" (specific symbol). Multiple targets separated by spaces.
+- input_content: (optional) Text content to extract file paths from (alternative to targets for processing diffs/logs).
+
 Usage Example:
 
 <examples>
@@ -7484,9 +7455,7 @@ User: Lets read the whole file
 
 User: Read the first 10 lines of the file
 <extract>
-<targets>src/search/ranking.rs</targets>
-<line>1</line>
-<end_line>10</end_line>
+<targets>src/search/ranking.rs:1-10</targets>
 </extract>
 
 User: Read file inside the dependency
@@ -49412,9 +49381,7 @@ Examples:
 </search>
 
 <extract>
-<path>src/config.js</path>
-<start_line>15</start_line>
-<end_line>25</end_line>
+<targets>src/config.js:15-25</targets>
 </extract>
 
 <attempt_completion>

package/build/extract.js

@@ -48,7 +48,7 @@ export async function extract(options) {
 	const hasContent = options.content !== undefined && options.content !== null;
 
 	if (!hasFiles && !hasInputFile && !hasContent) {
-		throw new Error('Either files array, inputFile, or content must be provided');
+		throw new Error('Extract requires one of: "files" (array of file paths), "inputFile" (path to input file), or "content" (string/buffer for stdin)');
 	}
 
 	// Get the binary path

package/build/mcp/index.js

@@ -149,18 +149,18 @@ class ProbeServer {
                 },
                 {
                     name: 'extract_code',
-                    description: "Extract code from files. Formats: file.js (whole file), file.js:42 (from line), file.js#functionName (symbol).",
+                    description: "Extract code blocks from files using tree-sitter AST parsing. Each file path can include optional line numbers or symbol names to extract specific code blocks.",
                     inputSchema: {
                         type: 'object',
                         properties: {
                             path: {
                                 type: 'string',
-                                description: 'Absolute path to the project directory',
+                                description: 'Absolute path to the project root directory (used as working directory for relative file paths)',
                             },
                             files: {
                                 type: 'array',
                                 items: { type: 'string' },
-                                description: 'Array of file paths with optional line/symbol: ["file.rs:10", "file.rs#func_name"]',
+                                description: 'Array of file paths to extract from. Formats: "file.js" (entire file), "file.js:42" (code block at line 42), "file.js:10-20" (lines 10-20), "file.js#funcName" (specific symbol). Line numbers and symbols are part of the path string, not separate parameters. Paths can be absolute or relative to the project directory.',
                             }
                         },
                         required: ['path', 'files'],

package/build/mcp/index.ts

@@ -199,18 +199,18 @@ class ProbeServer {
         },
         {
           name: 'extract_code',
-          description: "Extract code from files. Formats: file.js (whole file), file.js:42 (from line), file.js#functionName (symbol).",
+          description: "Extract code blocks from files using tree-sitter AST parsing. Each file path can include optional line numbers or symbol names to extract specific code blocks.",
           inputSchema: {
             type: 'object',
             properties: {
               path: {
                 type: 'string',
-                description: 'Absolute path to the project directory',
+                description: 'Absolute path to the project root directory (used as working directory for relative file paths)',
               },
               files: {
                 type: 'array',
                 items: { type: 'string' },
-                description: 'Array of file paths with optional line/symbol: ["file.rs:10", "file.rs#func_name"]',
+                description: 'Array of file paths to extract from. Formats: "file.js" (entire file), "file.js:42" (code block at line 42), "file.js:10-20" (lines 10-20), "file.js#funcName" (specific symbol). Line numbers and symbols are part of the path string, not separate parameters. Paths can be absolute or relative to the project directory.',
               }
             },
             required: ['path', 'files'],

package/build/tools/common.js

@@ -7,13 +7,8 @@ import { z } from 'zod';
 
 // Common schemas for tool parameters (used for internal execution after XML parsing)
 export const searchSchema = z.object({
-	query: z.string().describe('Search query with Elasticsearch syntax. Use + for important terms.'),
-	path: z.string().optional().default('.').describe('Path to search in. For dependencies use "go:github.com/owner/repo", "js:package_name", or "rust:cargo_name" etc.'),
-	allow_tests: z.boolean().optional().default(false).describe('Allow test files in search results'),
-	exact: z.boolean().optional().default(false).describe('Perform exact search without tokenization (case-insensitive)'),
-	maxResults: z.number().optional().describe('Maximum number of results to return'),
-	maxTokens: z.number().optional().default(10000).describe('Maximum number of tokens to return'),
-	language: z.string().optional().describe('Limit search to files of a specific programming language')
+	query: z.string().describe('Search query with Elasticsearch syntax. Use quotes for exact matches, AND/OR for boolean logic, - for negation.'),
+	path: z.string().optional().default('.').describe('Path to search in. For dependencies use "go:github.com/owner/repo", "js:package_name", or "rust:cargo_name" etc.')
 });
 
 export const querySchema = z.object({
@@ -24,13 +19,8 @@ export const querySchema = z.object({
 });
 
 export const extractSchema = z.object({
-	targets: z.string().optional().describe('File paths or symbols to extract from. Can include line numbers, symbol names, or multiple space-separated targets'),
-	input_content: z.string().optional().describe('Text content to extract file paths from'),
-	line: z.number().optional().describe('Start line number to extract a specific code block'),
-	end_line: z.number().optional().describe('End line number for extracting a range of lines'),
-	allow_tests: z.boolean().optional().default(false).describe('Allow test files and test code blocks'),
-	context_lines: z.number().optional().default(10).describe('Number of context lines to include'),
-	format: z.string().optional().default('plain').describe('Output format (plain, markdown, json, xml, color, outline-xml, outline-diff)')
+	targets: z.string().optional().describe('File paths or symbols to extract from. Formats: "file.js" (whole file), "file.js:42" (line 42), "file.js:10-20" (lines 10-20), "file.js#funcName" (symbol). Multiple targets separated by spaces.'),
+	input_content: z.string().optional().describe('Text content to extract file paths from (alternative to targets)')
 });
 
 export const delegateSchema = z.object({
@@ -120,13 +110,8 @@ You need to focus on main keywords when constructing the query, and always use e
 - Once data is returned, it's cached and won't return on next runs (this is expected behavior)
 
 Parameters:
-- query: (required) Search query with Elasticsearch syntax. You can use + for important terms, and - for negation.
-- path: (required) Path to search in. All dependencies located in /dep folder, under language sub folders, like this: "/dep/go/github.com/owner/repo", "/dep/js/package_name", or "/dep/rust/cargo_name" etc. YOU SHOULD ALWAYS provide FULL PATH when searching dependencies, including depency name.
-- allow_tests: (optional, default: false) Allow test files in search results (true/false).
-- exact: (optional, default: false) Perform exact pricise search. Use it when you already know function or struct name, or some other code block, and want exact match.
-- maxResults: (optional) Maximum number of results to return (number).
-- maxTokens: (optional, default: 10000) Maximum number of tokens to return (number).
-- language: (optional) Limit search to files of a specific programming language (e.g., 'rust', 'js', 'python', 'go' etc.).
+- query: (required) Search query with Elasticsearch syntax. Use quotes for exact matches ("functionName"), AND/OR for boolean logic, - for negation, + for important terms.
+- path: (optional, default: '.') Path to search in. All dependencies located in /dep folder, under language sub folders, like this: "/dep/go/github.com/owner/repo", "/dep/js/package_name", or "/dep/rust/cargo_name" etc.
 
 **Workflow:** Always start with search, then use extract for detailed context when needed.
 
@@ -148,30 +133,24 @@ User: How to calculate the total amount in the payments module?
 <search>
 <query>calculate AND payment</query>
 <path>src/utils</path>
-<allow_tests>false</allow_tests>
 </search>
 
 User: How do the user authentication and authorization work?
 <search>
-<query>+user and (authentification OR authroization OR authz)</query>
+<query>+user AND (authentication OR authorization OR authz)</query>
 <path>.</path>
-<allow_tests>true</allow_tests>
-<language>go</language>
 </search>
 
 User: Find all react imports in the project.
 <search>
-<query>import { react }</query>
+<query>"import" AND "react"</query>
 <path>.</path>
-<exact>true</exact>
-<language>js</language>
 </search>
 
-User: Find how decompoud library works?
+User: Find how decompound library works?
 <search>
-<query>import { react }</query>
+<query>decompound</query>
 <path>/dep/rust/decompound</path>
-<language>rust</language>
 </search>
 
 </examples>
@@ -208,11 +187,9 @@ Full file extraction should be the LAST RESORT! Always prefer search.
 **Session Awareness:** Reuse context from previous tool calls. Don't re-extract the same symbols you already have.
 
 Parameters:
-- targets: (required) File paths or symbols to extract from. Can include line numbers, symbol names, or multiple space-separated targets (e.g., 'src/main.rs:10-20', 'src/utils.js#myFunction').
-  For multiple extractions: 'session.rs#AuthService.login auth.rs:2-100 config.rs#DatabaseConfig'
-- line: (optional) Start line number to extract a specific code block. Use with end_line for ranges.
-- end_line: (optional) End line number for extracting a range of lines.
-- allow_tests: (optional, default: false) Allow test files and test code blocks (true/false).
+- targets: (required) File paths or symbols to extract from. Formats: "file.js" (whole file), "file.js:42" (code block at line 42), "file.js:10-20" (lines 10-20), "file.js#funcName" (specific symbol). Multiple targets separated by spaces.
+- input_content: (optional) Text content to extract file paths from (alternative to targets for processing diffs/logs).
+
 Usage Example:
 
 <examples>
@@ -239,9 +216,7 @@ User: Lets read the whole file
 
 User: Read the first 10 lines of the file
 <extract>
-<targets>src/search/ranking.rs</targets>
-<line>1</line>
-<end_line>10</end_line>
+<targets>src/search/ranking.rs:1-10</targets>
 </extract>
 
 User: Read file inside the dependency
@@ -349,7 +324,7 @@ export const bashDescription = 'Execute bash commands for system exploration and
 // Valid tool names that should be parsed as tool calls
 const DEFAULT_VALID_TOOLS = [
 	'search',
-	'query', 
+	'query',
 	'extract',
 	'delegate',
 	'listFiles',
@@ -358,6 +333,43 @@ const DEFAULT_VALID_TOOLS = [
 	'attempt_completion'
 ];
 
+/**
+ * Get valid parameter names for a specific tool from its schema
+ * @param {string} toolName - Name of the tool
+ * @returns {string[]} - Array of valid parameter names for this tool
+ */
+function getValidParamsForTool(toolName) {
+	// Map tool names to their schemas
+	const schemaMap = {
+		search: searchSchema,
+		query: querySchema,
+		extract: extractSchema,
+		delegate: delegateSchema,
+		bash: bashSchema,
+		attempt_completion: attemptCompletionSchema
+	};
+
+	const schema = schemaMap[toolName];
+	if (!schema) {
+		// For tools without schema (listFiles, searchFiles, implement), return common params
+		// These are the shared params that appear across multiple tools
+		return ['path', 'directory', 'pattern', 'recursive', 'includeHidden', 'task', 'files', 'autoCommits', 'result'];
+	}
+
+	// For attempt_completion, it has custom validation, just return 'result'
+	if (toolName === 'attempt_completion') {
+		return ['result'];
+	}
+
+	// Extract keys from Zod schema
+	if (schema && schema._def && schema._def.shape) {
+		return Object.keys(schema._def.shape());
+	}
+
+	// Fallback: return empty array if we can't extract schema keys
+	return [];
+}
+
 // Simple XML parser helper - safer string-based approach
 export function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
 	// Look for each valid tool name specifically using string search
@@ -387,15 +399,12 @@ export function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
 
 		const params = {};
 
+		// Get valid parameters for this specific tool from its schema
+		const validParams = getValidParamsForTool(toolName);
+
 		// Parse parameters using string-based approach for better safety
-		// Common parameter names to look for (can be extended as needed)
-		// Note: includes both camelCase and underscore_case variants to handle inconsistencies
-		const commonParams = ['query', 'file_path', 'line', 'end_line', 'path', 'recursive', 'includeHidden',
-		                      'max_results', 'maxResults', 'result', 'command', 'description', 'task', 'param', 'pattern',
-		                      'allow_tests', 'exact', 'maxTokens', 'language', 'input_content',
-		                      'context_lines', 'format', 'directory', 'autoCommits', 'files', 'targets'];
-
-		for (const paramName of commonParams) {
+		// Only look for parameters that are valid for this specific tool
+		for (const paramName of validParams) {
 			const paramOpenTag = `<${paramName}>`;
 			const paramCloseTag = `</${paramName}>`;
 
@@ -410,7 +419,7 @@ export function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
 			if (paramCloseIndex === -1) {
 				// Find the next opening tag after this parameter
 				let nextTagIndex = innerContent.length;
-				for (const nextParam of commonParams) {
+				for (const nextParam of validParams) {
 					const nextOpenTag = `<${nextParam}>`;
 					const nextIndex = innerContent.indexOf(nextOpenTag, paramOpenIndex + paramOpenTag.length);
 					if (nextIndex !== -1 && nextIndex < nextTagIndex) {

package/cjs/agent/ProbeAgent.cjs

@@ -28645,7 +28645,7 @@ async function extract(options) {
   const hasInputFile = !!options.inputFile;
   const hasContent = options.content !== void 0 && options.content !== null;
   if (!hasFiles && !hasInputFile && !hasContent) {
-    throw new Error("Either files array, inputFile, or content must be provided");
+    throw new Error('Extract requires one of: "files" (array of file paths), "inputFile" (path to input file), or "content" (string/buffer for stdin)');
   }
   const binaryPath = await getBinaryPath(options.binaryOptions || {});
   const filteredOptions = { ...options };
@@ -32912,6 +32912,27 @@ var init_zod = __esm({
 });
 
 // src/tools/common.js
+function getValidParamsForTool(toolName) {
+  const schemaMap = {
+    search: searchSchema,
+    query: querySchema,
+    extract: extractSchema,
+    delegate: delegateSchema,
+    bash: bashSchema,
+    attempt_completion: attemptCompletionSchema
+  };
+  const schema = schemaMap[toolName];
+  if (!schema) {
+    return ["path", "directory", "pattern", "recursive", "includeHidden", "task", "files", "autoCommits", "result"];
+  }
+  if (toolName === "attempt_completion") {
+    return ["result"];
+  }
+  if (schema && schema._def && schema._def.shape) {
+    return Object.keys(schema._def.shape());
+  }
+  return [];
+}
 function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
   for (const toolName of validTools) {
     const openTag = `<${toolName}>`;
@@ -32930,35 +32951,8 @@ function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
       closeIndex
     );
     const params = {};
-    const commonParams3 = [
-      "query",
-      "file_path",
-      "line",
-      "end_line",
-      "path",
-      "recursive",
-      "includeHidden",
-      "max_results",
-      "maxResults",
-      "result",
-      "command",
-      "description",
-      "task",
-      "param",
-      "pattern",
-      "allow_tests",
-      "exact",
-      "maxTokens",
-      "language",
-      "input_content",
-      "context_lines",
-      "format",
-      "directory",
-      "autoCommits",
-      "files",
-      "targets"
-    ];
-    for (const paramName of commonParams3) {
+    const validParams = getValidParamsForTool(toolName);
+    for (const paramName of validParams) {
       const paramOpenTag = `<${paramName}>`;
       const paramCloseTag = `</${paramName}>`;
       const paramOpenIndex = innerContent.indexOf(paramOpenTag);
@@ -32968,7 +32962,7 @@ function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
       let paramCloseIndex = innerContent.indexOf(paramCloseTag, paramOpenIndex + paramOpenTag.length);
       if (paramCloseIndex === -1) {
         let nextTagIndex = innerContent.length;
-        for (const nextParam of commonParams3) {
+        for (const nextParam of validParams) {
           const nextOpenTag = `<${nextParam}>`;
           const nextIndex = innerContent.indexOf(nextOpenTag, paramOpenIndex + paramOpenTag.length);
           if (nextIndex !== -1 && nextIndex < nextTagIndex) {
@@ -33030,13 +33024,8 @@ var init_common2 = __esm({
     "use strict";
     init_zod();
     searchSchema = external_exports.object({
-      query: external_exports.string().describe("Search query with Elasticsearch syntax. Use + for important terms."),
-      path: external_exports.string().optional().default(".").describe('Path to search in. For dependencies use "go:github.com/owner/repo", "js:package_name", or "rust:cargo_name" etc.'),
-      allow_tests: external_exports.boolean().optional().default(false).describe("Allow test files in search results"),
-      exact: external_exports.boolean().optional().default(false).describe("Perform exact search without tokenization (case-insensitive)"),
-      maxResults: external_exports.number().optional().describe("Maximum number of results to return"),
-      maxTokens: external_exports.number().optional().default(1e4).describe("Maximum number of tokens to return"),
-      language: external_exports.string().optional().describe("Limit search to files of a specific programming language")
+      query: external_exports.string().describe("Search query with Elasticsearch syntax. Use quotes for exact matches, AND/OR for boolean logic, - for negation."),
+      path: external_exports.string().optional().default(".").describe('Path to search in. For dependencies use "go:github.com/owner/repo", "js:package_name", or "rust:cargo_name" etc.')
     });
     querySchema = external_exports.object({
       pattern: external_exports.string().describe("AST pattern to search for. Use $NAME for variable names, $$$PARAMS for parameter lists, etc."),
@@ -33045,13 +33034,8 @@ var init_common2 = __esm({
       allow_tests: external_exports.boolean().optional().default(false).describe("Allow test files in search results")
     });
     extractSchema = external_exports.object({
-      targets: external_exports.string().optional().describe("File paths or symbols to extract from. Can include line numbers, symbol names, or multiple space-separated targets"),
-      input_content: external_exports.string().optional().describe("Text content to extract file paths from"),
-      line: external_exports.number().optional().describe("Start line number to extract a specific code block"),
-      end_line: external_exports.number().optional().describe("End line number for extracting a range of lines"),
-      allow_tests: external_exports.boolean().optional().default(false).describe("Allow test files and test code blocks"),
-      context_lines: external_exports.number().optional().default(10).describe("Number of context lines to include"),
-      format: external_exports.string().optional().default("plain").describe("Output format (plain, markdown, json, xml, color, outline-xml, outline-diff)")
+      targets: external_exports.string().optional().describe('File paths or symbols to extract from. Formats: "file.js" (whole file), "file.js:42" (line 42), "file.js:10-20" (lines 10-20), "file.js#funcName" (symbol). Multiple targets separated by spaces.'),
+      input_content: external_exports.string().optional().describe("Text content to extract file paths from (alternative to targets)")
     });
     delegateSchema = external_exports.object({
       task: external_exports.string().describe("The task to delegate to a subagent. Be specific about what needs to be accomplished.")
@@ -33126,13 +33110,8 @@ You need to focus on main keywords when constructing the query, and always use e
 - Once data is returned, it's cached and won't return on next runs (this is expected behavior)
 
 Parameters:
-- query: (required) Search query with Elasticsearch syntax. You can use + for important terms, and - for negation.
-- path: (required) Path to search in. All dependencies located in /dep folder, under language sub folders, like this: "/dep/go/github.com/owner/repo", "/dep/js/package_name", or "/dep/rust/cargo_name" etc. YOU SHOULD ALWAYS provide FULL PATH when searching dependencies, including depency name.
-- allow_tests: (optional, default: false) Allow test files in search results (true/false).
-- exact: (optional, default: false) Perform exact pricise search. Use it when you already know function or struct name, or some other code block, and want exact match.
-- maxResults: (optional) Maximum number of results to return (number).
-- maxTokens: (optional, default: 10000) Maximum number of tokens to return (number).
-- language: (optional) Limit search to files of a specific programming language (e.g., 'rust', 'js', 'python', 'go' etc.).
+- query: (required) Search query with Elasticsearch syntax. Use quotes for exact matches ("functionName"), AND/OR for boolean logic, - for negation, + for important terms.
+- path: (optional, default: '.') Path to search in. All dependencies located in /dep folder, under language sub folders, like this: "/dep/go/github.com/owner/repo", "/dep/js/package_name", or "/dep/rust/cargo_name" etc.
 
 **Workflow:** Always start with search, then use extract for detailed context when needed.
 
@@ -33154,30 +33133,24 @@ User: How to calculate the total amount in the payments module?
 <search>
 <query>calculate AND payment</query>
 <path>src/utils</path>
-<allow_tests>false</allow_tests>
 </search>
 
 User: How do the user authentication and authorization work?
 <search>
-<query>+user and (authentification OR authroization OR authz)</query>
+<query>+user AND (authentication OR authorization OR authz)</query>
 <path>.</path>
-<allow_tests>true</allow_tests>
-<language>go</language>
 </search>
 
 User: Find all react imports in the project.
 <search>
-<query>import { react }</query>
+<query>"import" AND "react"</query>
 <path>.</path>
-<exact>true</exact>
-<language>js</language>
 </search>
 
-User: Find how decompoud library works?
+User: Find how decompound library works?
 <search>
-<query>import { react }</query>
+<query>decompound</query>
 <path>/dep/rust/decompound</path>
-<language>rust</language>
 </search>
 
 </examples>
@@ -33212,11 +33185,9 @@ Full file extraction should be the LAST RESORT! Always prefer search.
 **Session Awareness:** Reuse context from previous tool calls. Don't re-extract the same symbols you already have.
 
 Parameters:
-- targets: (required) File paths or symbols to extract from. Can include line numbers, symbol names, or multiple space-separated targets (e.g., 'src/main.rs:10-20', 'src/utils.js#myFunction').
-  For multiple extractions: 'session.rs#AuthService.login auth.rs:2-100 config.rs#DatabaseConfig'
-- line: (optional) Start line number to extract a specific code block. Use with end_line for ranges.
-- end_line: (optional) End line number for extracting a range of lines.
-- allow_tests: (optional, default: false) Allow test files and test code blocks (true/false).
+- targets: (required) File paths or symbols to extract from. Formats: "file.js" (whole file), "file.js:42" (code block at line 42), "file.js:10-20" (lines 10-20), "file.js#funcName" (specific symbol). Multiple targets separated by spaces.
+- input_content: (optional) Text content to extract file paths from (alternative to targets for processing diffs/logs).
+
 Usage Example:
 
 <examples>
@@ -33243,9 +33214,7 @@ User: Lets read the whole file
 
 User: Read the first 10 lines of the file
 <extract>
-<targets>src/search/ranking.rs</targets>
-<line>1</line>
-<end_line>10</end_line>
+<targets>src/search/ranking.rs:1-10</targets>
 </extract>
 
 User: Read file inside the dependency
@@ -74959,9 +74928,7 @@ Examples:
 </search>
 
 <extract>
-<path>src/config.js</path>
-<start_line>15</start_line>
-<end_line>25</end_line>
+<targets>src/config.js:15-25</targets>
 </extract>
 
 <attempt_completion>

package/cjs/index.cjs

@@ -1589,7 +1589,7 @@ async function extract(options) {
   const hasInputFile = !!options.inputFile;
   const hasContent = options.content !== void 0 && options.content !== null;
   if (!hasFiles && !hasInputFile && !hasContent) {
-    throw new Error("Either files array, inputFile, or content must be provided");
+    throw new Error('Extract requires one of: "files" (array of file paths), "inputFile" (path to input file), or "content" (string/buffer for stdin)');
   }
   const binaryPath = await getBinaryPath(options.binaryOptions || {});
   const filteredOptions = { ...options };
@@ -5912,6 +5912,27 @@ var init_zod = __esm({
 });
 
 // src/tools/common.js
+function getValidParamsForTool(toolName) {
+  const schemaMap = {
+    search: searchSchema,
+    query: querySchema,
+    extract: extractSchema,
+    delegate: delegateSchema,
+    bash: bashSchema,
+    attempt_completion: attemptCompletionSchema
+  };
+  const schema = schemaMap[toolName];
+  if (!schema) {
+    return ["path", "directory", "pattern", "recursive", "includeHidden", "task", "files", "autoCommits", "result"];
+  }
+  if (toolName === "attempt_completion") {
+    return ["result"];
+  }
+  if (schema && schema._def && schema._def.shape) {
+    return Object.keys(schema._def.shape());
+  }
+  return [];
+}
 function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
   for (const toolName of validTools) {
     const openTag = `<${toolName}>`;
@@ -5930,35 +5951,8 @@ function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
       closeIndex
     );
     const params = {};
-    const commonParams3 = [
-      "query",
-      "file_path",
-      "line",
-      "end_line",
-      "path",
-      "recursive",
-      "includeHidden",
-      "max_results",
-      "maxResults",
-      "result",
-      "command",
-      "description",
-      "task",
-      "param",
-      "pattern",
-      "allow_tests",
-      "exact",
-      "maxTokens",
-      "language",
-      "input_content",
-      "context_lines",
-      "format",
-      "directory",
-      "autoCommits",
-      "files",
-      "targets"
-    ];
-    for (const paramName of commonParams3) {
+    const validParams = getValidParamsForTool(toolName);
+    for (const paramName of validParams) {
       const paramOpenTag = `<${paramName}>`;
       const paramCloseTag = `</${paramName}>`;
       const paramOpenIndex = innerContent.indexOf(paramOpenTag);
@@ -5968,7 +5962,7 @@ function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
       let paramCloseIndex = innerContent.indexOf(paramCloseTag, paramOpenIndex + paramOpenTag.length);
       if (paramCloseIndex === -1) {
         let nextTagIndex = innerContent.length;
-        for (const nextParam of commonParams3) {
+        for (const nextParam of validParams) {
           const nextOpenTag = `<${nextParam}>`;
           const nextIndex = innerContent.indexOf(nextOpenTag, paramOpenIndex + paramOpenTag.length);
           if (nextIndex !== -1 && nextIndex < nextTagIndex) {
@@ -6030,13 +6024,8 @@ var init_common = __esm({
     "use strict";
     init_zod();
     searchSchema = external_exports.object({
-      query: external_exports.string().describe("Search query with Elasticsearch syntax. Use + for important terms."),
-      path: external_exports.string().optional().default(".").describe('Path to search in. For dependencies use "go:github.com/owner/repo", "js:package_name", or "rust:cargo_name" etc.'),
-      allow_tests: external_exports.boolean().optional().default(false).describe("Allow test files in search results"),
-      exact: external_exports.boolean().optional().default(false).describe("Perform exact search without tokenization (case-insensitive)"),
-      maxResults: external_exports.number().optional().describe("Maximum number of results to return"),
-      maxTokens: external_exports.number().optional().default(1e4).describe("Maximum number of tokens to return"),
-      language: external_exports.string().optional().describe("Limit search to files of a specific programming language")
+      query: external_exports.string().describe("Search query with Elasticsearch syntax. Use quotes for exact matches, AND/OR for boolean logic, - for negation."),
+      path: external_exports.string().optional().default(".").describe('Path to search in. For dependencies use "go:github.com/owner/repo", "js:package_name", or "rust:cargo_name" etc.')
     });
     querySchema = external_exports.object({
       pattern: external_exports.string().describe("AST pattern to search for. Use $NAME for variable names, $$$PARAMS for parameter lists, etc."),
@@ -6045,13 +6034,8 @@ var init_common = __esm({
       allow_tests: external_exports.boolean().optional().default(false).describe("Allow test files in search results")
     });
     extractSchema = external_exports.object({
-      targets: external_exports.string().optional().describe("File paths or symbols to extract from. Can include line numbers, symbol names, or multiple space-separated targets"),
-      input_content: external_exports.string().optional().describe("Text content to extract file paths from"),
-      line: external_exports.number().optional().describe("Start line number to extract a specific code block"),
-      end_line: external_exports.number().optional().describe("End line number for extracting a range of lines"),
-      allow_tests: external_exports.boolean().optional().default(false).describe("Allow test files and test code blocks"),
-      context_lines: external_exports.number().optional().default(10).describe("Number of context lines to include"),
-      format: external_exports.string().optional().default("plain").describe("Output format (plain, markdown, json, xml, color, outline-xml, outline-diff)")
+      targets: external_exports.string().optional().describe('File paths or symbols to extract from. Formats: "file.js" (whole file), "file.js:42" (line 42), "file.js:10-20" (lines 10-20), "file.js#funcName" (symbol). Multiple targets separated by spaces.'),
+      input_content: external_exports.string().optional().describe("Text content to extract file paths from (alternative to targets)")
     });
     delegateSchema = external_exports.object({
       task: external_exports.string().describe("The task to delegate to a subagent. Be specific about what needs to be accomplished.")
@@ -6126,13 +6110,8 @@ You need to focus on main keywords when constructing the query, and always use e
 - Once data is returned, it's cached and won't return on next runs (this is expected behavior)
 
 Parameters:
-- query: (required) Search query with Elasticsearch syntax. You can use + for important terms, and - for negation.
-- path: (required) Path to search in. All dependencies located in /dep folder, under language sub folders, like this: "/dep/go/github.com/owner/repo", "/dep/js/package_name", or "/dep/rust/cargo_name" etc. YOU SHOULD ALWAYS provide FULL PATH when searching dependencies, including depency name.
-- allow_tests: (optional, default: false) Allow test files in search results (true/false).
-- exact: (optional, default: false) Perform exact pricise search. Use it when you already know function or struct name, or some other code block, and want exact match.
-- maxResults: (optional) Maximum number of results to return (number).
-- maxTokens: (optional, default: 10000) Maximum number of tokens to return (number).
-- language: (optional) Limit search to files of a specific programming language (e.g., 'rust', 'js', 'python', 'go' etc.).
+- query: (required) Search query with Elasticsearch syntax. Use quotes for exact matches ("functionName"), AND/OR for boolean logic, - for negation, + for important terms.
+- path: (optional, default: '.') Path to search in. All dependencies located in /dep folder, under language sub folders, like this: "/dep/go/github.com/owner/repo", "/dep/js/package_name", or "/dep/rust/cargo_name" etc.
 
 **Workflow:** Always start with search, then use extract for detailed context when needed.
 
@@ -6154,30 +6133,24 @@ User: How to calculate the total amount in the payments module?
 <search>
 <query>calculate AND payment</query>
 <path>src/utils</path>
-<allow_tests>false</allow_tests>
 </search>
 
 User: How do the user authentication and authorization work?
 <search>
-<query>+user and (authentification OR authroization OR authz)</query>
+<query>+user AND (authentication OR authorization OR authz)</query>
 <path>.</path>
-<allow_tests>true</allow_tests>
-<language>go</language>
 </search>
 
 User: Find all react imports in the project.
 <search>
-<query>import { react }</query>
+<query>"import" AND "react"</query>
 <path>.</path>
-<exact>true</exact>
-<language>js</language>
 </search>
 
-User: Find how decompoud library works?
+User: Find how decompound library works?
 <search>
-<query>import { react }</query>
+<query>decompound</query>
 <path>/dep/rust/decompound</path>
-<language>rust</language>
 </search>
 
 </examples>
@@ -6212,11 +6185,9 @@ Full file extraction should be the LAST RESORT! Always prefer search.
 **Session Awareness:** Reuse context from previous tool calls. Don't re-extract the same symbols you already have.
 
 Parameters:
-- targets: (required) File paths or symbols to extract from. Can include line numbers, symbol names, or multiple space-separated targets (e.g., 'src/main.rs:10-20', 'src/utils.js#myFunction').
-  For multiple extractions: 'session.rs#AuthService.login auth.rs:2-100 config.rs#DatabaseConfig'
-- line: (optional) Start line number to extract a specific code block. Use with end_line for ranges.
-- end_line: (optional) End line number for extracting a range of lines.
-- allow_tests: (optional, default: false) Allow test files and test code blocks (true/false).
+- targets: (required) File paths or symbols to extract from. Formats: "file.js" (whole file), "file.js:42" (code block at line 42), "file.js:10-20" (lines 10-20), "file.js#funcName" (specific symbol). Multiple targets separated by spaces.
+- input_content: (optional) Text content to extract file paths from (alternative to targets for processing diffs/logs).
+
 Usage Example:
 
 <examples>
@@ -6243,9 +6214,7 @@ User: Lets read the whole file
 
 User: Read the first 10 lines of the file
 <extract>
-<targets>src/search/ranking.rs</targets>
-<line>1</line>
-<end_line>10</end_line>
+<targets>src/search/ranking.rs:1-10</targets>
 </extract>
 
 User: Read file inside the dependency
@@ -75136,9 +75105,7 @@ Examples:
 </search>
 
 <extract>
-<path>src/config.js</path>
-<start_line>15</start_line>
-<end_line>25</end_line>
+<targets>src/config.js:15-25</targets>
 </extract>
 
 <attempt_completion>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@probelabs/probe",
-  "version": "0.6.0-rc148",
+  "version": "0.6.0-rc149",
   "description": "Node.js wrapper for the probe code search tool",
   "main": "src/index.js",
   "module": "src/index.js",

package/src/agent/ProbeAgent.js

@@ -920,9 +920,7 @@ Examples:
 </search>
 
 <extract>
-<path>src/config.js</path>
-<start_line>15</start_line>
-<end_line>25</end_line>
+<targets>src/config.js:15-25</targets>
 </extract>
 
 <attempt_completion>

package/src/extract.js

@@ -48,7 +48,7 @@ export async function extract(options) {
 	const hasContent = options.content !== undefined && options.content !== null;
 
 	if (!hasFiles && !hasInputFile && !hasContent) {
-		throw new Error('Either files array, inputFile, or content must be provided');
+		throw new Error('Extract requires one of: "files" (array of file paths), "inputFile" (path to input file), or "content" (string/buffer for stdin)');
 	}
 
 	// Get the binary path

package/src/mcp/index.ts

@@ -199,18 +199,18 @@ class ProbeServer {
         },
         {
           name: 'extract_code',
-          description: "Extract code from files. Formats: file.js (whole file), file.js:42 (from line), file.js#functionName (symbol).",
+          description: "Extract code blocks from files using tree-sitter AST parsing. Each file path can include optional line numbers or symbol names to extract specific code blocks.",
           inputSchema: {
             type: 'object',
             properties: {
               path: {
                 type: 'string',
-                description: 'Absolute path to the project directory',
+                description: 'Absolute path to the project root directory (used as working directory for relative file paths)',
               },
               files: {
                 type: 'array',
                 items: { type: 'string' },
-                description: 'Array of file paths with optional line/symbol: ["file.rs:10", "file.rs#func_name"]',
+                description: 'Array of file paths to extract from. Formats: "file.js" (entire file), "file.js:42" (code block at line 42), "file.js:10-20" (lines 10-20), "file.js#funcName" (specific symbol). Line numbers and symbols are part of the path string, not separate parameters. Paths can be absolute or relative to the project directory.',
               }
             },
             required: ['path', 'files'],

package/src/tools/common.js

@@ -7,13 +7,8 @@ import { z } from 'zod';
 
 // Common schemas for tool parameters (used for internal execution after XML parsing)
 export const searchSchema = z.object({
-	query: z.string().describe('Search query with Elasticsearch syntax. Use + for important terms.'),
-	path: z.string().optional().default('.').describe('Path to search in. For dependencies use "go:github.com/owner/repo", "js:package_name", or "rust:cargo_name" etc.'),
-	allow_tests: z.boolean().optional().default(false).describe('Allow test files in search results'),
-	exact: z.boolean().optional().default(false).describe('Perform exact search without tokenization (case-insensitive)'),
-	maxResults: z.number().optional().describe('Maximum number of results to return'),
-	maxTokens: z.number().optional().default(10000).describe('Maximum number of tokens to return'),
-	language: z.string().optional().describe('Limit search to files of a specific programming language')
+	query: z.string().describe('Search query with Elasticsearch syntax. Use quotes for exact matches, AND/OR for boolean logic, - for negation.'),
+	path: z.string().optional().default('.').describe('Path to search in. For dependencies use "go:github.com/owner/repo", "js:package_name", or "rust:cargo_name" etc.')
 });
 
 export const querySchema = z.object({
@@ -24,13 +19,8 @@ export const querySchema = z.object({
 });
 
 export const extractSchema = z.object({
-	targets: z.string().optional().describe('File paths or symbols to extract from. Can include line numbers, symbol names, or multiple space-separated targets'),
-	input_content: z.string().optional().describe('Text content to extract file paths from'),
-	line: z.number().optional().describe('Start line number to extract a specific code block'),
-	end_line: z.number().optional().describe('End line number for extracting a range of lines'),
-	allow_tests: z.boolean().optional().default(false).describe('Allow test files and test code blocks'),
-	context_lines: z.number().optional().default(10).describe('Number of context lines to include'),
-	format: z.string().optional().default('plain').describe('Output format (plain, markdown, json, xml, color, outline-xml, outline-diff)')
+	targets: z.string().optional().describe('File paths or symbols to extract from. Formats: "file.js" (whole file), "file.js:42" (line 42), "file.js:10-20" (lines 10-20), "file.js#funcName" (symbol). Multiple targets separated by spaces.'),
+	input_content: z.string().optional().describe('Text content to extract file paths from (alternative to targets)')
 });
 
 export const delegateSchema = z.object({
@@ -120,13 +110,8 @@ You need to focus on main keywords when constructing the query, and always use e
 - Once data is returned, it's cached and won't return on next runs (this is expected behavior)
 
 Parameters:
-- query: (required) Search query with Elasticsearch syntax. You can use + for important terms, and - for negation.
-- path: (required) Path to search in. All dependencies located in /dep folder, under language sub folders, like this: "/dep/go/github.com/owner/repo", "/dep/js/package_name", or "/dep/rust/cargo_name" etc. YOU SHOULD ALWAYS provide FULL PATH when searching dependencies, including depency name.
-- allow_tests: (optional, default: false) Allow test files in search results (true/false).
-- exact: (optional, default: false) Perform exact pricise search. Use it when you already know function or struct name, or some other code block, and want exact match.
-- maxResults: (optional) Maximum number of results to return (number).
-- maxTokens: (optional, default: 10000) Maximum number of tokens to return (number).
-- language: (optional) Limit search to files of a specific programming language (e.g., 'rust', 'js', 'python', 'go' etc.).
+- query: (required) Search query with Elasticsearch syntax. Use quotes for exact matches ("functionName"), AND/OR for boolean logic, - for negation, + for important terms.
+- path: (optional, default: '.') Path to search in. All dependencies located in /dep folder, under language sub folders, like this: "/dep/go/github.com/owner/repo", "/dep/js/package_name", or "/dep/rust/cargo_name" etc.
 
 **Workflow:** Always start with search, then use extract for detailed context when needed.
 
@@ -148,30 +133,24 @@ User: How to calculate the total amount in the payments module?
 <search>
 <query>calculate AND payment</query>
 <path>src/utils</path>
-<allow_tests>false</allow_tests>
 </search>
 
 User: How do the user authentication and authorization work?
 <search>
-<query>+user and (authentification OR authroization OR authz)</query>
+<query>+user AND (authentication OR authorization OR authz)</query>
 <path>.</path>
-<allow_tests>true</allow_tests>
-<language>go</language>
 </search>
 
 User: Find all react imports in the project.
 <search>
-<query>import { react }</query>
+<query>"import" AND "react"</query>
 <path>.</path>
-<exact>true</exact>
-<language>js</language>
 </search>
 
-User: Find how decompoud library works?
+User: Find how decompound library works?
 <search>
-<query>import { react }</query>
+<query>decompound</query>
 <path>/dep/rust/decompound</path>
-<language>rust</language>
 </search>
 
 </examples>
@@ -208,11 +187,9 @@ Full file extraction should be the LAST RESORT! Always prefer search.
 **Session Awareness:** Reuse context from previous tool calls. Don't re-extract the same symbols you already have.
 
 Parameters:
-- targets: (required) File paths or symbols to extract from. Can include line numbers, symbol names, or multiple space-separated targets (e.g., 'src/main.rs:10-20', 'src/utils.js#myFunction').
-  For multiple extractions: 'session.rs#AuthService.login auth.rs:2-100 config.rs#DatabaseConfig'
-- line: (optional) Start line number to extract a specific code block. Use with end_line for ranges.
-- end_line: (optional) End line number for extracting a range of lines.
-- allow_tests: (optional, default: false) Allow test files and test code blocks (true/false).
+- targets: (required) File paths or symbols to extract from. Formats: "file.js" (whole file), "file.js:42" (code block at line 42), "file.js:10-20" (lines 10-20), "file.js#funcName" (specific symbol). Multiple targets separated by spaces.
+- input_content: (optional) Text content to extract file paths from (alternative to targets for processing diffs/logs).
+
 Usage Example:
 
 <examples>
@@ -239,9 +216,7 @@ User: Lets read the whole file
 
 User: Read the first 10 lines of the file
 <extract>
-<targets>src/search/ranking.rs</targets>
-<line>1</line>
-<end_line>10</end_line>
+<targets>src/search/ranking.rs:1-10</targets>
 </extract>
 
 User: Read file inside the dependency
@@ -349,7 +324,7 @@ export const bashDescription = 'Execute bash commands for system exploration and
 // Valid tool names that should be parsed as tool calls
 const DEFAULT_VALID_TOOLS = [
 	'search',
-	'query', 
+	'query',
 	'extract',
 	'delegate',
 	'listFiles',
@@ -358,6 +333,43 @@ const DEFAULT_VALID_TOOLS = [
 	'attempt_completion'
 ];
 
+/**
+ * Get valid parameter names for a specific tool from its schema
+ * @param {string} toolName - Name of the tool
+ * @returns {string[]} - Array of valid parameter names for this tool
+ */
+function getValidParamsForTool(toolName) {
+	// Map tool names to their schemas
+	const schemaMap = {
+		search: searchSchema,
+		query: querySchema,
+		extract: extractSchema,
+		delegate: delegateSchema,
+		bash: bashSchema,
+		attempt_completion: attemptCompletionSchema
+	};
+
+	const schema = schemaMap[toolName];
+	if (!schema) {
+		// For tools without schema (listFiles, searchFiles, implement), return common params
+		// These are the shared params that appear across multiple tools
+		return ['path', 'directory', 'pattern', 'recursive', 'includeHidden', 'task', 'files', 'autoCommits', 'result'];
+	}
+
+	// For attempt_completion, it has custom validation, just return 'result'
+	if (toolName === 'attempt_completion') {
+		return ['result'];
+	}
+
+	// Extract keys from Zod schema
+	if (schema && schema._def && schema._def.shape) {
+		return Object.keys(schema._def.shape());
+	}
+
+	// Fallback: return empty array if we can't extract schema keys
+	return [];
+}
+
 // Simple XML parser helper - safer string-based approach
 export function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
 	// Look for each valid tool name specifically using string search
@@ -387,15 +399,12 @@ export function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
 
 		const params = {};
 
+		// Get valid parameters for this specific tool from its schema
+		const validParams = getValidParamsForTool(toolName);
+
 		// Parse parameters using string-based approach for better safety
-		// Common parameter names to look for (can be extended as needed)
-		// Note: includes both camelCase and underscore_case variants to handle inconsistencies
-		const commonParams = ['query', 'file_path', 'line', 'end_line', 'path', 'recursive', 'includeHidden',
-		                      'max_results', 'maxResults', 'result', 'command', 'description', 'task', 'param', 'pattern',
-		                      'allow_tests', 'exact', 'maxTokens', 'language', 'input_content',
-		                      'context_lines', 'format', 'directory', 'autoCommits', 'files', 'targets'];
-
-		for (const paramName of commonParams) {
+		// Only look for parameters that are valid for this specific tool
+		for (const paramName of validParams) {
 			const paramOpenTag = `<${paramName}>`;
 			const paramCloseTag = `</${paramName}>`;
 
@@ -410,7 +419,7 @@ export function parseXmlToolCall(xmlString, validTools = DEFAULT_VALID_TOOLS) {
 			if (paramCloseIndex === -1) {
 				// Find the next opening tag after this parameter
 				let nextTagIndex = innerContent.length;
-				for (const nextParam of commonParams) {
+				for (const nextParam of validParams) {
 					const nextOpenTag = `<${nextParam}>`;
 					const nextIndex = innerContent.indexOf(nextOpenTag, paramOpenIndex + paramOpenTag.length);
 					if (nextIndex !== -1 && nextIndex < nextTagIndex) {