@librechat/agents 3.2.32 → 3.2.34

package/dist/esm/tools/ToolSearch.mjs

@@ -1,895 +1,750 @@
-import { config } from 'dotenv';
-import * as okapibm25Module from 'okapibm25';
-import fetch from 'node-fetch';
-import { HttpsProxyAgent } from 'https-proxy-agent';
-import { tool } from '@langchain/core/tools';
-import { getCodeBaseURL } from './CodeExecutor.mjs';
-import { Constants } from '../common/enum.mjs';
-
-// src/tools/ToolSearch.ts
+import "../common/enum.mjs";
+import "../common/index.mjs";
+import { getCodeBaseURL } from "./CodeExecutor.mjs";
+import { tool } from "@langchain/core/tools";
+import { config } from "dotenv";
+import fetch from "node-fetch";
+import { HttpsProxyAgent } from "https-proxy-agent";
+import * as okapibm25Module from "okapibm25";
+//#region src/tools/ToolSearch.ts
 function getBM25Function() {
-    const mod = okapibm25Module;
-    if (typeof mod === 'function')
-        return mod;
-    if (typeof mod.default === 'function')
-        return mod.default;
-    if (mod.default != null && typeof mod.default.default === 'function')
-        return mod.default.default;
-    throw new Error('Could not resolve BM25 function from okapibm25 module');
+	const mod = okapibm25Module;
+	if (typeof mod === "function") return mod;
+	if (typeof mod.default === "function") return mod.default;
+	if (mod.default != null && typeof mod.default.default === "function") return mod.default.default;
+	throw new Error("Could not resolve BM25 function from okapibm25 module");
 }
 const BM25 = getBM25Function();
 config();
 /** Maximum allowed regex pattern length */
 const MAX_PATTERN_LENGTH = 200;
-const ToolSearchToolName = Constants.TOOL_SEARCH;
-const ToolSearchToolDescription = 'Searches deferred tools using BM25 ranking. Multi-word queries supported. Use mcp_server param to filter by server.';
-const QUERY_DESCRIPTION_LOCAL = 'Search term to find in tool names and descriptions. Case-insensitive substring matching. Optional if mcp_server is provided.';
-const QUERY_DESCRIPTION_REGEX = 'Regex pattern to search tool names and descriptions. Optional if mcp_server is provided.';
-const FIELDS_DESCRIPTION = 'Which fields to search. Default: name and description';
-const MAX_RESULTS_DESCRIPTION = 'Maximum number of matching tools to return';
+const ToolSearchToolName = "tool_search";
+const ToolSearchToolDescription = "Searches deferred tools using BM25 ranking. Multi-word queries supported. Use mcp_server param to filter by server.";
+const QUERY_DESCRIPTION_LOCAL = "Search term to find in tool names and descriptions. Case-insensitive substring matching. Optional if mcp_server is provided.";
+const QUERY_DESCRIPTION_REGEX = "Regex pattern to search tool names and descriptions. Optional if mcp_server is provided.";
+const FIELDS_DESCRIPTION = "Which fields to search. Default: name and description";
+const MAX_RESULTS_DESCRIPTION = "Maximum number of matching tools to return";
 const DEFAULT_MAX_RESULTS = 5;
-const MCP_SERVER_DESCRIPTION = 'Filter to tools from specific MCP server(s). Can be a single server name or array of names. If provided without a query, lists all tools from those servers.';
+const MCP_SERVER_DESCRIPTION = "Filter to tools from specific MCP server(s). Can be a single server name or array of names. If provided without a query, lists all tools from those servers.";
 const ToolSearchToolSchema = {
-    type: 'object',
-    properties: {
-        query: {
-            type: 'string',
-            maxLength: MAX_PATTERN_LENGTH,
-            default: '',
-            description: QUERY_DESCRIPTION_LOCAL,
-        },
-        fields: {
-            type: 'array',
-            items: { type: 'string', enum: ['name', 'description', 'parameters'] },
-            default: ['name', 'description'],
-            description: FIELDS_DESCRIPTION,
-        },
-        max_results: {
-            type: 'integer',
-            minimum: 1,
-            maximum: 50,
-            default: DEFAULT_MAX_RESULTS,
-            description: MAX_RESULTS_DESCRIPTION,
-        },
-        mcp_server: {
-            oneOf: [{ type: 'string' }, { type: 'array', items: { type: 'string' } }],
-            description: MCP_SERVER_DESCRIPTION,
-        },
-    },
-    required: [],
+	type: "object",
+	properties: {
+		query: {
+			type: "string",
+			maxLength: MAX_PATTERN_LENGTH,
+			default: "",
+			description: QUERY_DESCRIPTION_LOCAL
+		},
+		fields: {
+			type: "array",
+			items: {
+				type: "string",
+				enum: [
+					"name",
+					"description",
+					"parameters"
+				]
+			},
+			default: ["name", "description"],
+			description: FIELDS_DESCRIPTION
+		},
+		max_results: {
+			type: "integer",
+			minimum: 1,
+			maximum: 50,
+			default: DEFAULT_MAX_RESULTS,
+			description: MAX_RESULTS_DESCRIPTION
+		},
+		mcp_server: {
+			oneOf: [{ type: "string" }, {
+				type: "array",
+				items: { type: "string" }
+			}],
+			description: MCP_SERVER_DESCRIPTION
+		}
+	},
+	required: []
 };
 const ToolSearchToolDefinition = {
-    name: ToolSearchToolName,
-    description: ToolSearchToolDescription,
-    schema: ToolSearchToolSchema,
+	name: ToolSearchToolName,
+	description: ToolSearchToolDescription,
+	schema: ToolSearchToolSchema
 };
 /** Maximum allowed regex nesting depth */
 const MAX_REGEX_COMPLEXITY = 5;
 /** Default search timeout in milliseconds */
-const SEARCH_TIMEOUT = 5000;
+const SEARCH_TIMEOUT = 5e3;
 /**
- * Creates the JSON schema with dynamic query description based on mode.
- * @param mode - The search mode determining query interpretation
- * @returns JSON schema for tool search parameters
- */
+* Creates the JSON schema with dynamic query description based on mode.
+* @param mode - The search mode determining query interpretation
+* @returns JSON schema for tool search parameters
+*/
 function createToolSearchSchema(mode) {
-    const queryDescription = mode === 'local' ? QUERY_DESCRIPTION_LOCAL : QUERY_DESCRIPTION_REGEX;
-    return {
-        type: 'object',
-        properties: {
-            query: {
-                type: 'string',
-                maxLength: MAX_PATTERN_LENGTH,
-                default: '',
-                description: queryDescription,
-            },
-            fields: {
-                type: 'array',
-                items: { type: 'string', enum: ['name', 'description', 'parameters'] },
-                default: ['name', 'description'],
-                description: FIELDS_DESCRIPTION,
-            },
-            max_results: {
-                type: 'integer',
-                minimum: 1,
-                maximum: 50,
-                default: DEFAULT_MAX_RESULTS,
-                description: MAX_RESULTS_DESCRIPTION,
-            },
-            mcp_server: {
-                oneOf: [
-                    { type: 'string' },
-                    { type: 'array', items: { type: 'string' } },
-                ],
-                description: MCP_SERVER_DESCRIPTION,
-            },
-        },
-        required: [],
-    };
+	return {
+		type: "object",
+		properties: {
+			query: {
+				type: "string",
+				maxLength: MAX_PATTERN_LENGTH,
+				default: "",
+				description: mode === "local" ? QUERY_DESCRIPTION_LOCAL : QUERY_DESCRIPTION_REGEX
+			},
+			fields: {
+				type: "array",
+				items: {
+					type: "string",
+					enum: [
+						"name",
+						"description",
+						"parameters"
+					]
+				},
+				default: ["name", "description"],
+				description: FIELDS_DESCRIPTION
+			},
+			max_results: {
+				type: "integer",
+				minimum: 1,
+				maximum: 50,
+				default: DEFAULT_MAX_RESULTS,
+				description: MAX_RESULTS_DESCRIPTION
+			},
+			mcp_server: {
+				oneOf: [{ type: "string" }, {
+					type: "array",
+					items: { type: "string" }
+				}],
+				description: MCP_SERVER_DESCRIPTION
+			}
+		},
+		required: []
+	};
 }
 /**
- * Extracts the MCP server name from a tool name.
- * MCP tools follow the pattern: toolName_mcp_serverName
- * @param toolName - The full tool name
- * @returns The server name if it's an MCP tool, undefined otherwise
- */
+* Extracts the MCP server name from a tool name.
+* MCP tools follow the pattern: toolName_mcp_serverName
+* @param toolName - The full tool name
+* @returns The server name if it's an MCP tool, undefined otherwise
+*/
 function extractMcpServerName(toolName) {
-    const delimiterIndex = toolName.indexOf(Constants.MCP_DELIMITER);
-    if (delimiterIndex === -1) {
-        return undefined;
-    }
-    return toolName.substring(delimiterIndex + Constants.MCP_DELIMITER.length);
+	const delimiterIndex = toolName.indexOf("_mcp_");
+	if (delimiterIndex === -1) return;
+	return toolName.substring(delimiterIndex + 5);
 }
 /**
- * Checks if a tool belongs to a specific MCP server.
- * @param toolName - The full tool name
- * @param serverName - The server name to match
- * @returns True if the tool belongs to the specified server
- */
+* Checks if a tool belongs to a specific MCP server.
+* @param toolName - The full tool name
+* @param serverName - The server name to match
+* @returns True if the tool belongs to the specified server
+*/
 function isFromMcpServer(toolName, serverName) {
-    const toolServer = extractMcpServerName(toolName);
-    return toolServer === serverName;
+	return extractMcpServerName(toolName) === serverName;
 }
 /**
- * Checks if a tool belongs to any of the specified MCP servers.
- * @param toolName - The full tool name
- * @param serverNames - Array of server names to match
- * @returns True if the tool belongs to any of the specified servers
- */
+* Checks if a tool belongs to any of the specified MCP servers.
+* @param toolName - The full tool name
+* @param serverNames - Array of server names to match
+* @returns True if the tool belongs to any of the specified servers
+*/
 function isFromAnyMcpServer(toolName, serverNames) {
-    const toolServer = extractMcpServerName(toolName);
-    if (toolServer === undefined) {
-        return false;
-    }
-    return serverNames.includes(toolServer);
+	const toolServer = extractMcpServerName(toolName);
+	if (toolServer === void 0) return false;
+	return serverNames.includes(toolServer);
 }
 /**
- * Normalizes server filter input to always be an array.
- * @param serverFilter - String, array of strings, or undefined
- * @returns Array of server names (empty if none specified)
- */
+* Normalizes server filter input to always be an array.
+* @param serverFilter - String, array of strings, or undefined
+* @returns Array of server names (empty if none specified)
+*/
 function normalizeServerFilter(serverFilter) {
-    if (serverFilter === undefined) {
-        return [];
-    }
-    if (typeof serverFilter === 'string') {
-        return serverFilter === '' ? [] : [serverFilter];
-    }
-    return serverFilter.filter((s) => s !== '');
+	if (serverFilter === void 0) return [];
+	if (typeof serverFilter === "string") return serverFilter === "" ? [] : [serverFilter];
+	return serverFilter.filter((s) => s !== "");
 }
 /**
- * Extracts all unique MCP server names from a tool registry.
- * @param toolRegistry - The tool registry to scan
- * @param onlyDeferred - If true, only considers deferred tools
- * @returns Array of unique server names, sorted alphabetically
- */
+* Extracts all unique MCP server names from a tool registry.
+* @param toolRegistry - The tool registry to scan
+* @param onlyDeferred - If true, only considers deferred tools
+* @returns Array of unique server names, sorted alphabetically
+*/
 function getAvailableMcpServers(toolRegistry, onlyDeferred = true) {
-    if (!toolRegistry) {
-        return [];
-    }
-    const servers = new Set();
-    for (const [, toolDef] of toolRegistry) {
-        if (onlyDeferred && toolDef.defer_loading !== true) {
-            continue;
-        }
-        const server = extractMcpServerName(toolDef.name);
-        if (server !== undefined && server !== '') {
-            servers.add(server);
-        }
-    }
-    return Array.from(servers).sort();
+	if (!toolRegistry) return [];
+	const servers = /* @__PURE__ */ new Set();
+	for (const [, toolDef] of toolRegistry) {
+		if (onlyDeferred && toolDef.defer_loading !== true) continue;
+		const server = extractMcpServerName(toolDef.name);
+		if (server !== void 0 && server !== "") servers.add(server);
+	}
+	return Array.from(servers).sort();
 }
 /**
- * Escapes special regex characters in a string to use as a literal pattern.
- * @param pattern - The string to escape
- * @returns The escaped string safe for use in a RegExp
- */
+* Escapes special regex characters in a string to use as a literal pattern.
+* @param pattern - The string to escape
+* @returns The escaped string safe for use in a RegExp
+*/
 function escapeRegexSpecialChars(pattern) {
-    return pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+	return pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 /**
- * Counts the maximum nesting depth of groups in a regex pattern.
- * @param pattern - The regex pattern to analyze
- * @returns The maximum nesting depth
- */
+* Counts the maximum nesting depth of groups in a regex pattern.
+* @param pattern - The regex pattern to analyze
+* @returns The maximum nesting depth
+*/
 function countNestedGroups(pattern) {
-    let maxDepth = 0;
-    let currentDepth = 0;
-    for (let i = 0; i < pattern.length; i++) {
-        if (pattern[i] === '(' && (i === 0 || pattern[i - 1] !== '\\')) {
-            currentDepth++;
-            maxDepth = Math.max(maxDepth, currentDepth);
-        }
-        else if (pattern[i] === ')' && (i === 0 || pattern[i - 1] !== '\\')) {
-            currentDepth = Math.max(0, currentDepth - 1);
-        }
-    }
-    return maxDepth;
+	let maxDepth = 0;
+	let currentDepth = 0;
+	for (let i = 0; i < pattern.length; i++) if (pattern[i] === "(" && (i === 0 || pattern[i - 1] !== "\\")) {
+		currentDepth++;
+		maxDepth = Math.max(maxDepth, currentDepth);
+	} else if (pattern[i] === ")" && (i === 0 || pattern[i - 1] !== "\\")) currentDepth = Math.max(0, currentDepth - 1);
+	return maxDepth;
 }
 /**
- * Detects nested quantifiers that can cause catastrophic backtracking.
- * Patterns like (a+)+, (a*)*, (a+)*, etc.
- * @param pattern - The regex pattern to check
- * @returns True if nested quantifiers are detected
- */
+* Detects nested quantifiers that can cause catastrophic backtracking.
+* Patterns like (a+)+, (a*)*, (a+)*, etc.
+* @param pattern - The regex pattern to check
+* @returns True if nested quantifiers are detected
+*/
 function hasNestedQuantifiers(pattern) {
-    const nestedQuantifierPattern = /\([^)]*[+*][^)]*\)[+*?]/;
-    return nestedQuantifierPattern.test(pattern);
+	return /\([^)]*[+*][^)]*\)[+*?]/.test(pattern);
 }
 /**
- * Checks if a regex pattern contains potentially dangerous constructs.
- * @param pattern - The regex pattern to validate
- * @returns True if the pattern is dangerous
- */
+* Checks if a regex pattern contains potentially dangerous constructs.
+* @param pattern - The regex pattern to validate
+* @returns True if the pattern is dangerous
+*/
 function isDangerousPattern(pattern) {
-    if (hasNestedQuantifiers(pattern)) {
-        return true;
-    }
-    if (countNestedGroups(pattern) > MAX_REGEX_COMPLEXITY) {
-        return true;
-    }
-    const dangerousPatterns = [
-        /\.\{1000,\}/, // Excessive wildcards
-        /\(\?=\.\{100,\}\)/, // Runaway lookaheads
-        /\([^)]*\|\s*\){20,}/, // Excessive alternation (rough check)
-        /\(\.\*\)\+/, // (.*)+
-        /\(\.\+\)\+/, // (.+)+
-        /\(\.\*\)\*/, // (.*)*
-        /\(\.\+\)\*/, // (.+)*
-    ];
-    for (const dangerous of dangerousPatterns) {
-        if (dangerous.test(pattern)) {
-            return true;
-        }
-    }
-    return false;
+	if (hasNestedQuantifiers(pattern)) return true;
+	if (countNestedGroups(pattern) > MAX_REGEX_COMPLEXITY) return true;
+	for (const dangerous of [
+		/\.\{1000,\}/,
+		/\(\?=\.\{100,\}\)/,
+		/\([^)]*\|\s*\){20,}/,
+		/\(\.\*\)\+/,
+		/\(\.\+\)\+/,
+		/\(\.\*\)\*/,
+		/\(\.\+\)\*/
+	]) if (dangerous.test(pattern)) return true;
+	return false;
 }
 /**
- * Sanitizes a regex pattern for safe execution.
- * If the pattern is dangerous, it will be escaped to a literal string search.
- * @param pattern - The regex pattern to sanitize
- * @returns Object containing the safe pattern and whether it was escaped
- */
+* Sanitizes a regex pattern for safe execution.
+* If the pattern is dangerous, it will be escaped to a literal string search.
+* @param pattern - The regex pattern to sanitize
+* @returns Object containing the safe pattern and whether it was escaped
+*/
 function sanitizeRegex(pattern) {
-    if (isDangerousPattern(pattern)) {
-        return {
-            safe: escapeRegexSpecialChars(pattern),
-            wasEscaped: true,
-        };
-    }
-    try {
-        new RegExp(pattern);
-        return { safe: pattern, wasEscaped: false };
-    }
-    catch {
-        return {
-            safe: escapeRegexSpecialChars(pattern),
-            wasEscaped: true,
-        };
-    }
+	if (isDangerousPattern(pattern)) return {
+		safe: escapeRegexSpecialChars(pattern),
+		wasEscaped: true
+	};
+	try {
+		new RegExp(pattern);
+		return {
+			safe: pattern,
+			wasEscaped: false
+		};
+	} catch {
+		return {
+			safe: escapeRegexSpecialChars(pattern),
+			wasEscaped: true
+		};
+	}
 }
 /**
- * Simplifies tool parameters for search purposes.
- * Extracts only the essential structure needed for parameter name searching.
- * @param parameters - The tool's JSON schema parameters
- * @returns Simplified parameters object
- */
+* Simplifies tool parameters for search purposes.
+* Extracts only the essential structure needed for parameter name searching.
+* @param parameters - The tool's JSON schema parameters
+* @returns Simplified parameters object
+*/
 function simplifyParametersForSearch(parameters) {
-    if (!parameters) {
-        return undefined;
-    }
-    if (parameters.properties) {
-        return {
-            type: parameters.type,
-            properties: Object.fromEntries(Object.entries(parameters.properties).map(([key, value]) => [
-                key,
-                { type: value.type },
-            ])),
-        };
-    }
-    return { type: parameters.type };
+	if (!parameters) return;
+	if (parameters.properties) return {
+		type: parameters.type,
+		properties: Object.fromEntries(Object.entries(parameters.properties).map(([key, value]) => [key, { type: value.type }]))
+	};
+	return { type: parameters.type };
 }
 /**
- * Tokenizes a string into lowercase words for BM25.
- * Splits on underscores and non-alphanumeric characters for consistent matching.
- * @param text - The text to tokenize
- * @returns Array of lowercase tokens
- */
+* Tokenizes a string into lowercase words for BM25.
+* Splits on underscores and non-alphanumeric characters for consistent matching.
+* @param text - The text to tokenize
+* @returns Array of lowercase tokens
+*/
 function tokenize(text) {
-    return text
-        .toLowerCase()
-        .replace(/[^a-z0-9]/g, ' ')
-        .split(/\s+/)
-        .filter((token) => token.length > 0);
+	return text.toLowerCase().replace(/[^a-z0-9]/g, " ").split(/\s+/).filter((token) => token.length > 0);
 }
 /**
- * Creates a searchable document string from tool metadata.
- * @param tool - The tool metadata
- * @param fields - Which fields to include
- * @returns Combined document string for BM25
- */
+* Creates a searchable document string from tool metadata.
+* @param tool - The tool metadata
+* @param fields - Which fields to include
+* @returns Combined document string for BM25
+*/
 function createToolDocument(tool, fields) {
-    const parts = [];
-    if (fields.includes('name')) {
-        const baseName = tool.name.replace(/_/g, ' ');
-        parts.push(baseName, baseName);
-    }
-    if (fields.includes('description') && tool.description) {
-        parts.push(tool.description);
-    }
-    if (fields.includes('parameters') && tool.parameters?.properties) {
-        const paramNames = Object.keys(tool.parameters.properties).join(' ');
-        parts.push(paramNames);
-    }
-    return parts.join(' ');
+	const parts = [];
+	if (fields.includes("name")) {
+		const baseName = tool.name.replace(/_/g, " ");
+		parts.push(baseName, baseName);
+	}
+	if (fields.includes("description") && tool.description) parts.push(tool.description);
+	if (fields.includes("parameters") && tool.parameters?.properties) {
+		const paramNames = Object.keys(tool.parameters.properties).join(" ");
+		parts.push(paramNames);
+	}
+	return parts.join(" ");
 }
 /**
- * Determines which field had the best match for a query.
- * @param tool - The tool to check
- * @param queryTokens - Tokenized query
- * @param fields - Fields to check
- * @returns The matched field and a snippet
- */
+* Determines which field had the best match for a query.
+* @param tool - The tool to check
+* @param queryTokens - Tokenized query
+* @param fields - Fields to check
+* @returns The matched field and a snippet
+*/
 function findMatchedField(tool, queryTokens, fields) {
-    if (fields.includes('name')) {
-        const nameLower = tool.name.toLowerCase();
-        for (const token of queryTokens) {
-            if (nameLower.includes(token)) {
-                return { field: 'name', snippet: tool.name };
-            }
-        }
-    }
-    if (fields.includes('description') && tool.description) {
-        const descLower = tool.description.toLowerCase();
-        for (const token of queryTokens) {
-            if (descLower.includes(token)) {
-                return {
-                    field: 'description',
-                    snippet: tool.description.substring(0, 100),
-                };
-            }
-        }
-    }
-    if (fields.includes('parameters') && tool.parameters?.properties) {
-        const paramNames = Object.keys(tool.parameters.properties);
-        const paramLower = paramNames.join(' ').toLowerCase();
-        for (const token of queryTokens) {
-            if (paramLower.includes(token)) {
-                return { field: 'parameters', snippet: paramNames.join(', ') };
-            }
-        }
-    }
-    const fallbackSnippet = tool.description
-        ? tool.description.substring(0, 100)
-        : tool.name;
-    return { field: 'unknown', snippet: fallbackSnippet };
+	if (fields.includes("name")) {
+		const nameLower = tool.name.toLowerCase();
+		for (const token of queryTokens) if (nameLower.includes(token)) return {
+			field: "name",
+			snippet: tool.name
+		};
+	}
+	if (fields.includes("description") && tool.description) {
+		const descLower = tool.description.toLowerCase();
+		for (const token of queryTokens) if (descLower.includes(token)) return {
+			field: "description",
+			snippet: tool.description.substring(0, 100)
+		};
+	}
+	if (fields.includes("parameters") && tool.parameters?.properties) {
+		const paramNames = Object.keys(tool.parameters.properties);
+		const paramLower = paramNames.join(" ").toLowerCase();
+		for (const token of queryTokens) if (paramLower.includes(token)) return {
+			field: "parameters",
+			snippet: paramNames.join(", ")
+		};
+	}
+	return {
+		field: "unknown",
+		snippet: tool.description ? tool.description.substring(0, 100) : tool.name
+	};
 }
 /**
- * Performs BM25-based search for better relevance ranking.
- * Uses Okapi BM25 algorithm for term frequency and document length normalization.
- * If query is empty, returns all tools (up to maxResults) sorted alphabetically.
- * @param tools - Array of tool metadata to search
- * @param query - The search query (empty returns all tools)
- * @param fields - Which fields to search
- * @param maxResults - Maximum results to return
- * @returns Search response with matching tools ranked by BM25 score
- */
+* Performs BM25-based search for better relevance ranking.
+* Uses Okapi BM25 algorithm for term frequency and document length normalization.
+* If query is empty, returns all tools (up to maxResults) sorted alphabetically.
+* @param tools - Array of tool metadata to search
+* @param query - The search query (empty returns all tools)
+* @param fields - Which fields to search
+* @param maxResults - Maximum results to return
+* @returns Search response with matching tools ranked by BM25 score
+*/
 function performLocalSearch(tools, query, fields, maxResults) {
-    if (tools.length === 0) {
-        return {
-            tool_references: [],
-            total_tools_searched: 0,
-            pattern_used: query,
-        };
-    }
-    const queryTokens = tokenize(query);
-    if (queryTokens.length === 0) {
-        const allTools = tools
-            .slice()
-            .sort((a, b) => a.name.localeCompare(b.name))
-            .slice(0, maxResults)
-            .map((tool) => ({
-            tool_name: tool.name,
-            match_score: 1.0,
-            matched_field: 'name',
-            snippet: tool.description.substring(0, 100) || tool.name,
-        }));
-        return {
-            tool_references: allTools,
-            total_tools_searched: tools.length,
-            pattern_used: query,
-        };
-    }
-    const documents = tools.map((tool) => createToolDocument(tool, fields));
-    const scores = BM25(documents, queryTokens, { k1: 1.5, b: 0.75 });
-    const maxScore = Math.max(...scores.filter((s) => s > 0), 1);
-    const queryLower = query.toLowerCase().trim();
-    const results = [];
-    for (let i = 0; i < tools.length; i++) {
-        if (scores[i] > 0) {
-            const { field, snippet } = findMatchedField(tools[i], queryTokens, fields);
-            let normalizedScore = Math.min(scores[i] / maxScore, 1.0);
-            const baseName = getBaseToolName(tools[i].name).toLowerCase();
-            if (baseName === queryLower) {
-                normalizedScore = 1.0;
-            }
-            else if (baseName.startsWith(queryLower)) {
-                normalizedScore = Math.max(normalizedScore, 0.95);
-            }
-            results.push({
-                tool_name: tools[i].name,
-                match_score: normalizedScore,
-                matched_field: field,
-                snippet,
-            });
-        }
-    }
-    results.sort((a, b) => b.match_score - a.match_score);
-    const topResults = results.slice(0, maxResults);
-    return {
-        tool_references: topResults,
-        total_tools_searched: tools.length,
-        pattern_used: query,
-    };
+	if (tools.length === 0) return {
+		tool_references: [],
+		total_tools_searched: 0,
+		pattern_used: query
+	};
+	const queryTokens = tokenize(query);
+	if (queryTokens.length === 0) return {
+		tool_references: tools.slice().sort((a, b) => a.name.localeCompare(b.name)).slice(0, maxResults).map((tool) => ({
+			tool_name: tool.name,
+			match_score: 1,
+			matched_field: "name",
+			snippet: tool.description.substring(0, 100) || tool.name
+		})),
+		total_tools_searched: tools.length,
+		pattern_used: query
+	};
+	const scores = BM25(tools.map((tool) => createToolDocument(tool, fields)), queryTokens, {
+		k1: 1.5,
+		b: .75
+	});
+	const maxScore = Math.max(...scores.filter((s) => s > 0), 1);
+	const queryLower = query.toLowerCase().trim();
+	const results = [];
+	for (let i = 0; i < tools.length; i++) if (scores[i] > 0) {
+		const { field, snippet } = findMatchedField(tools[i], queryTokens, fields);
+		let normalizedScore = Math.min(scores[i] / maxScore, 1);
+		const baseName = getBaseToolName(tools[i].name).toLowerCase();
+		if (baseName === queryLower) normalizedScore = 1;
+		else if (baseName.startsWith(queryLower)) normalizedScore = Math.max(normalizedScore, .95);
+		results.push({
+			tool_name: tools[i].name,
+			match_score: normalizedScore,
+			matched_field: field,
+			snippet
+		});
+	}
+	results.sort((a, b) => b.match_score - a.match_score);
+	return {
+		tool_references: results.slice(0, maxResults),
+		total_tools_searched: tools.length,
+		pattern_used: query
+	};
 }
 /**
- * Generates the JavaScript search script to be executed in the sandbox.
- * Uses plain JavaScript for maximum compatibility with the Code API.
- * @param deferredTools - Array of tool metadata to search through
- * @param fields - Which fields to search
- * @param maxResults - Maximum number of results to return
- * @param sanitizedPattern - The sanitized regex pattern
- * @returns The JavaScript code string
- */
+* Generates the JavaScript search script to be executed in the sandbox.
+* Uses plain JavaScript for maximum compatibility with the Code API.
+* @param deferredTools - Array of tool metadata to search through
+* @param fields - Which fields to search
+* @param maxResults - Maximum number of results to return
+* @param sanitizedPattern - The sanitized regex pattern
+* @returns The JavaScript code string
+*/
 function generateSearchScript(deferredTools, fields, maxResults, sanitizedPattern) {
-    const lines = [
-        '// Tool definitions (injected)',
-        'var tools = ' + JSON.stringify(deferredTools) + ';',
-        'var searchFields = ' + JSON.stringify(fields) + ';',
-        'var maxResults = ' + maxResults + ';',
-        'var pattern = ' + JSON.stringify(sanitizedPattern) + ';',
-        '',
-        '// Compile regex (pattern is sanitized client-side)',
-        'var regex;',
-        'try {',
-        '  regex = new RegExp(pattern, \'i\');',
-        '} catch (e) {',
-        '  regex = new RegExp(pattern.replace(/[.*+?^${}()[\\]\\\\|]/g, "\\\\$&"), "i");',
-        '}',
-        '',
-        '// Search logic',
-        'var results = [];',
-        '',
-        'for (var j = 0; j < tools.length; j++) {',
-        '  var tool = tools[j];',
-        '  var bestScore = 0;',
-        '  var matchedField = \'\';',
-        '  var snippet = \'\';',
-        '',
-        '  // Search name (highest priority)',
-        '  if (searchFields.indexOf(\'name\') >= 0 && regex.test(tool.name)) {',
-        '    bestScore = 0.95;',
-        '    matchedField = \'name\';',
-        '    snippet = tool.name;',
-        '  }',
-        '',
-        '  // Search description (medium priority)',
-        '  if (searchFields.indexOf(\'description\') >= 0 && tool.description && regex.test(tool.description)) {',
-        '    if (bestScore === 0) {',
-        '      bestScore = 0.75;',
-        '      matchedField = \'description\';',
-        '      snippet = tool.description.substring(0, 100);',
-        '    }',
-        '  }',
-        '',
-        '  // Search parameter names (lower priority)',
-        '  if (searchFields.indexOf(\'parameters\') >= 0 && tool.parameters && tool.parameters.properties) {',
-        '    var paramNames = Object.keys(tool.parameters.properties).join(\' \');',
-        '    if (regex.test(paramNames)) {',
-        '      if (bestScore === 0) {',
-        '        bestScore = 0.60;',
-        '        matchedField = \'parameters\';',
-        '        snippet = paramNames;',
-        '      }',
-        '    }',
-        '  }',
-        '',
-        '  if (bestScore > 0) {',
-        '    results.push({',
-        '      tool_name: tool.name,',
-        '      match_score: bestScore,',
-        '      matched_field: matchedField,',
-        '      snippet: snippet',
-        '    });',
-        '  }',
-        '}',
-        '',
-        '// Sort by score (descending) and limit results',
-        'results.sort(function(a, b) { return b.match_score - a.match_score; });',
-        'var topResults = results.slice(0, maxResults);',
-        '',
-        '// Output as JSON',
-        'console.log(JSON.stringify({',
-        '  tool_references: topResults.map(function(r) {',
-        '    return {',
-        '      tool_name: r.tool_name,',
-        '      match_score: r.match_score,',
-        '      matched_field: r.matched_field,',
-        '      snippet: r.snippet',
-        '    };',
-        '  }),',
-        '  total_tools_searched: tools.length,',
-        '  pattern_used: pattern',
-        '}));',
-    ];
-    return lines.join('\n');
+	return [
+		"// Tool definitions (injected)",
+		"var tools = " + JSON.stringify(deferredTools) + ";",
+		"var searchFields = " + JSON.stringify(fields) + ";",
+		"var maxResults = " + maxResults + ";",
+		"var pattern = " + JSON.stringify(sanitizedPattern) + ";",
+		"",
+		"// Compile regex (pattern is sanitized client-side)",
+		"var regex;",
+		"try {",
+		"  regex = new RegExp(pattern, 'i');",
+		"} catch (e) {",
+		"  regex = new RegExp(pattern.replace(/[.*+?^${}()[\\]\\\\|]/g, \"\\\\$&\"), \"i\");",
+		"}",
+		"",
+		"// Search logic",
+		"var results = [];",
+		"",
+		"for (var j = 0; j < tools.length; j++) {",
+		"  var tool = tools[j];",
+		"  var bestScore = 0;",
+		"  var matchedField = '';",
+		"  var snippet = '';",
+		"",
+		"  // Search name (highest priority)",
+		"  if (searchFields.indexOf('name') >= 0 && regex.test(tool.name)) {",
+		"    bestScore = 0.95;",
+		"    matchedField = 'name';",
+		"    snippet = tool.name;",
+		"  }",
+		"",
+		"  // Search description (medium priority)",
+		"  if (searchFields.indexOf('description') >= 0 && tool.description && regex.test(tool.description)) {",
+		"    if (bestScore === 0) {",
+		"      bestScore = 0.75;",
+		"      matchedField = 'description';",
+		"      snippet = tool.description.substring(0, 100);",
+		"    }",
+		"  }",
+		"",
+		"  // Search parameter names (lower priority)",
+		"  if (searchFields.indexOf('parameters') >= 0 && tool.parameters && tool.parameters.properties) {",
+		"    var paramNames = Object.keys(tool.parameters.properties).join(' ');",
+		"    if (regex.test(paramNames)) {",
+		"      if (bestScore === 0) {",
+		"        bestScore = 0.60;",
+		"        matchedField = 'parameters';",
+		"        snippet = paramNames;",
+		"      }",
+		"    }",
+		"  }",
+		"",
+		"  if (bestScore > 0) {",
+		"    results.push({",
+		"      tool_name: tool.name,",
+		"      match_score: bestScore,",
+		"      matched_field: matchedField,",
+		"      snippet: snippet",
+		"    });",
+		"  }",
+		"}",
+		"",
+		"// Sort by score (descending) and limit results",
+		"results.sort(function(a, b) { return b.match_score - a.match_score; });",
+		"var topResults = results.slice(0, maxResults);",
+		"",
+		"// Output as JSON",
+		"console.log(JSON.stringify({",
+		"  tool_references: topResults.map(function(r) {",
+		"    return {",
+		"      tool_name: r.tool_name,",
+		"      match_score: r.match_score,",
+		"      matched_field: r.matched_field,",
+		"      snippet: r.snippet",
+		"    };",
+		"  }),",
+		"  total_tools_searched: tools.length,",
+		"  pattern_used: pattern",
+		"}));"
+	].join("\n");
 }
 /**
- * Parses the search results from stdout JSON.
- * @param stdout - The stdout string containing JSON results
- * @returns Parsed search response
- */
+* Parses the search results from stdout JSON.
+* @param stdout - The stdout string containing JSON results
+* @returns Parsed search response
+*/
 function parseSearchResults(stdout) {
-    const jsonMatch = stdout.trim();
-    const parsed = JSON.parse(jsonMatch);
-    return parsed;
+	const jsonMatch = stdout.trim();
+	return JSON.parse(jsonMatch);
 }
 /**
- * Formats search results as structured JSON for efficient parsing.
- * @param searchResponse - The parsed search response
- * @param nameFormat - Whether to show 'full' names (tool_mcp_server) or 'base' names (tool only)
- * @returns JSON string with search results
- */
-function formatSearchResults(searchResponse, nameFormat = 'full') {
-    const { tool_references, total_tools_searched, pattern_used } = searchResponse;
-    const useFullName = nameFormat === 'full';
-    const output = {
-        found: tool_references.length,
-        tools: tool_references.map((ref) => ({
-            name: useFullName ? ref.tool_name : getBaseToolName(ref.tool_name),
-            score: Number(ref.match_score.toFixed(2)),
-            matched_in: ref.matched_field,
-            snippet: ref.snippet,
-        })),
-        total_searched: total_tools_searched,
-        query: pattern_used,
-    };
-    return JSON.stringify(output, null, 2);
+* Formats search results as structured JSON for efficient parsing.
+* @param searchResponse - The parsed search response
+* @param nameFormat - Whether to show 'full' names (tool_mcp_server) or 'base' names (tool only)
+* @returns JSON string with search results
+*/
+function formatSearchResults(searchResponse, nameFormat = "full") {
+	const { tool_references, total_tools_searched, pattern_used } = searchResponse;
+	const useFullName = nameFormat === "full";
+	const output = {
+		found: tool_references.length,
+		tools: tool_references.map((ref) => ({
+			name: useFullName ? ref.tool_name : getBaseToolName(ref.tool_name),
+			score: Number(ref.match_score.toFixed(2)),
+			matched_in: ref.matched_field,
+			snippet: ref.snippet
+		})),
+		total_searched: total_tools_searched,
+		query: pattern_used
+	};
+	return JSON.stringify(output, null, 2);
 }
 /**
- * Extracts the base tool name (without MCP server suffix) from a full tool name.
- * @param toolName - The full tool name
- * @returns The base tool name without server suffix
- */
+* Extracts the base tool name (without MCP server suffix) from a full tool name.
+* @param toolName - The full tool name
+* @returns The base tool name without server suffix
+*/
 function getBaseToolName(toolName) {
-    const delimiterIndex = toolName.indexOf(Constants.MCP_DELIMITER);
-    if (delimiterIndex === -1) {
-        return toolName;
-    }
-    return toolName.substring(0, delimiterIndex);
+	const delimiterIndex = toolName.indexOf("_mcp_");
+	if (delimiterIndex === -1) return toolName;
+	return toolName.substring(0, delimiterIndex);
 }
 /**
- * Checks whether a tool has any defined parameters in its JSON schema.
- * @param parameters - The tool's JSON schema parameters
- * @returns true if the tool has at least one parameter property
- */
+* Checks whether a tool has any defined parameters in its JSON schema.
+* @param parameters - The tool's JSON schema parameters
+* @returns true if the tool has at least one parameter property
+*/
 function hasParams(parameters) {
-    return (parameters?.properties != null &&
-        Object.keys(parameters.properties).length > 0);
+	return parameters?.properties != null && Object.keys(parameters.properties).length > 0;
 }
 /**
- * Generates a compact listing of deferred tools grouped by server.
- * Format: "server: tool1, tool2(\u2026), tool3"
- * Tools with parameters are annotated with (\u2026) to signal
- * that the LLM should discover the schema via tool_search before calling.
- * Non-MCP tools are grouped under "other".
- * @param toolRegistry - The tool registry
- * @param onlyDeferred - Whether to only include deferred tools
- * @returns Formatted string with tools grouped by server
- */
+* Generates a compact listing of deferred tools grouped by server.
+* Format: "server: tool1, tool2(\u2026), tool3"
+* Tools with parameters are annotated with (\u2026) to signal
+* that the LLM should discover the schema via tool_search before calling.
+* Non-MCP tools are grouped under "other".
+* @param toolRegistry - The tool registry
+* @param onlyDeferred - Whether to only include deferred tools
+* @returns Formatted string with tools grouped by server
+*/
 function getDeferredToolsListing(toolRegistry, onlyDeferred) {
-    if (!toolRegistry) {
-        return '';
-    }
-    const toolsByServer = {};
-    for (const lcTool of toolRegistry.values()) {
-        if (onlyDeferred && lcTool.defer_loading !== true) {
-            continue;
-        }
-        const toolName = lcTool.name;
-        const serverName = extractMcpServerName(toolName) ?? 'other';
-        const baseName = getBaseToolName(toolName);
-        const displayName = hasParams(lcTool.parameters)
-            ? `${baseName}(\u2026)`
-            : baseName;
-        if (!(serverName in toolsByServer)) {
-            toolsByServer[serverName] = [];
-        }
-        toolsByServer[serverName].push(displayName);
-    }
-    const serverNames = Object.keys(toolsByServer).sort((a, b) => {
-        if (a === 'other')
-            return 1;
-        if (b === 'other')
-            return -1;
-        return a.localeCompare(b);
-    });
-    if (serverNames.length === 0) {
-        return '';
-    }
-    const lines = serverNames.map((server) => `${server}: ${toolsByServer[server].join(', ')}`);
-    return lines.join('\n');
+	if (!toolRegistry) return "";
+	const toolsByServer = {};
+	for (const lcTool of toolRegistry.values()) {
+		if (onlyDeferred && lcTool.defer_loading !== true) continue;
+		const toolName = lcTool.name;
+		const serverName = extractMcpServerName(toolName) ?? "other";
+		const baseName = getBaseToolName(toolName);
+		const displayName = hasParams(lcTool.parameters) ? `${baseName}(\u2026)` : baseName;
+		if (!(serverName in toolsByServer)) toolsByServer[serverName] = [];
+		toolsByServer[serverName].push(displayName);
+	}
+	const serverNames = Object.keys(toolsByServer).sort((a, b) => {
+		if (a === "other") return 1;
+		if (b === "other") return -1;
+		return a.localeCompare(b);
+	});
+	if (serverNames.length === 0) return "";
+	return serverNames.map((server) => `${server}: ${toolsByServer[server].join(", ")}`).join("\n");
 }
 /**
- * Formats a server listing response as structured JSON.
- * NOTE: This is a PREVIEW only - tools are NOT discovered/loaded.
- * @param tools - Array of tool metadata from the server(s)
- * @param serverNames - The MCP server name(s)
- * @param nameFormat - Whether to show 'full' names (tool_mcp_server) or 'base' names (tool only)
- * @returns JSON string showing all tools grouped by server
- */
-function formatServerListing(tools, serverNames, nameFormat = 'full') {
-    const servers = Array.isArray(serverNames) ? serverNames : [serverNames];
-    const useFullName = nameFormat === 'full';
-    if (tools.length === 0) {
-        return JSON.stringify({
-            listing_mode: true,
-            servers,
-            total_tools: 0,
-            tools_by_server: {},
-            hint: 'No tools found from the specified MCP server(s).',
-        }, null, 2);
-    }
-    const toolsByServer = {};
-    for (const tool of tools) {
-        const server = extractMcpServerName(tool.name) ?? 'unknown';
-        if (!(server in toolsByServer)) {
-            toolsByServer[server] = [];
-        }
-        toolsByServer[server].push({
-            name: useFullName ? tool.name : getBaseToolName(tool.name),
-            description: tool.description.length > 100
-                ? tool.description.substring(0, 97) + '...'
-                : tool.description,
-        });
-    }
-    const exampleToolName = useFullName
-        ? (tools[0]?.name ?? 'tool_name')
-        : getBaseToolName(tools[0]?.name ?? 'tool_name');
-    const output = {
-        listing_mode: true,
-        servers,
-        total_tools: tools.length,
-        tools_by_server: toolsByServer,
-        hint: `To use a tool, search for it by name (e.g., query: "${exampleToolName}") to load it.`,
-    };
-    return JSON.stringify(output, null, 2);
+* Formats a server listing response as structured JSON.
+* NOTE: This is a PREVIEW only - tools are NOT discovered/loaded.
+* @param tools - Array of tool metadata from the server(s)
+* @param serverNames - The MCP server name(s)
+* @param nameFormat - Whether to show 'full' names (tool_mcp_server) or 'base' names (tool only)
+* @returns JSON string showing all tools grouped by server
+*/
+function formatServerListing(tools, serverNames, nameFormat = "full") {
+	const servers = Array.isArray(serverNames) ? serverNames : [serverNames];
+	const useFullName = nameFormat === "full";
+	if (tools.length === 0) return JSON.stringify({
+		listing_mode: true,
+		servers,
+		total_tools: 0,
+		tools_by_server: {},
+		hint: "No tools found from the specified MCP server(s)."
+	}, null, 2);
+	const toolsByServer = {};
+	for (const tool of tools) {
+		const server = extractMcpServerName(tool.name) ?? "unknown";
+		if (!(server in toolsByServer)) toolsByServer[server] = [];
+		toolsByServer[server].push({
+			name: useFullName ? tool.name : getBaseToolName(tool.name),
+			description: tool.description.length > 100 ? tool.description.substring(0, 97) + "..." : tool.description
+		});
+	}
+	const exampleToolName = useFullName ? tools[0]?.name ?? "tool_name" : getBaseToolName(tools[0]?.name ?? "tool_name");
+	const output = {
+		listing_mode: true,
+		servers,
+		total_tools: tools.length,
+		tools_by_server: toolsByServer,
+		hint: `To use a tool, search for it by name (e.g., query: "${exampleToolName}") to load it.`
+	};
+	return JSON.stringify(output, null, 2);
 }
 /**
- * Creates a Tool Search tool for discovering tools from a large registry.
- *
- * This tool enables AI agents to dynamically discover tools from a large library
- * without loading all tool definitions into the LLM context window. The agent
- * can search for relevant tools on-demand.
- *
- * **Modes:**
- * - `code_interpreter` (default): Uses external sandbox for regex search. Safer for complex patterns.
- * - `local`: Uses safe substring matching locally. No network call, faster, completely safe from ReDoS.
- *
- * The tool registry can be provided either:
- * 1. At initialization time via params.toolRegistry
- * 2. At runtime via config.configurable.toolRegistry when invoking
- *
- * @param params - Configuration parameters for the tool (toolRegistry is optional)
- * @returns A LangChain DynamicStructuredTool for tool searching
- *
- * @example
- * // Option 1: Code interpreter mode (regex via sandbox)
- * const tool = createToolSearch({ toolRegistry });
- * await tool.invoke({ query: 'expense.*report' });
- *
- * @example
- * // Option 2: Local mode (safe substring search)
- * const tool = createToolSearch({ mode: 'local', toolRegistry });
- * await tool.invoke({ query: 'expense' });
- */
+* Creates a Tool Search tool for discovering tools from a large registry.
+*
+* This tool enables AI agents to dynamically discover tools from a large library
+* without loading all tool definitions into the LLM context window. The agent
+* can search for relevant tools on-demand.
+*
+* **Modes:**
+* - `code_interpreter` (default): Uses external sandbox for regex search. Safer for complex patterns.
+* - `local`: Uses safe substring matching locally. No network call, faster, completely safe from ReDoS.
+*
+* The tool registry can be provided either:
+* 1. At initialization time via params.toolRegistry
+* 2. At runtime via config.configurable.toolRegistry when invoking
+*
+* @param params - Configuration parameters for the tool (toolRegistry is optional)
+* @returns A LangChain DynamicStructuredTool for tool searching
+*
+* @example
+* // Option 1: Code interpreter mode (regex via sandbox)
+* const tool = createToolSearch({ toolRegistry });
+* await tool.invoke({ query: 'expense.*report' });
+*
+* @example
+* // Option 2: Local mode (safe substring search)
+* const tool = createToolSearch({ mode: 'local', toolRegistry });
+* await tool.invoke({ query: 'expense' });
+*/
 function createToolSearch(initParams = {}) {
-    const mode = initParams.mode ?? 'code_interpreter';
-    const defaultOnlyDeferred = initParams.onlyDeferred ?? true;
-    const mcpNameFormat = initParams.mcpNameFormat ?? 'full';
-    const schema = createToolSearchSchema(mode);
-    const baseEndpoint = initParams.baseUrl ?? getCodeBaseURL();
-    const EXEC_ENDPOINT = `${baseEndpoint}/exec`;
-    const deferredToolsListing = getDeferredToolsListing(initParams.toolRegistry, defaultOnlyDeferred);
-    const toolsListSection = deferredToolsListing.length > 0
-        ? `
+	const mode = initParams.mode ?? "code_interpreter";
+	const defaultOnlyDeferred = initParams.onlyDeferred ?? true;
+	const mcpNameFormat = initParams.mcpNameFormat ?? "full";
+	const schema = createToolSearchSchema(mode);
+	const EXEC_ENDPOINT = `${initParams.baseUrl ?? getCodeBaseURL()}/exec`;
+	const deferredToolsListing = getDeferredToolsListing(initParams.toolRegistry, defaultOnlyDeferred);
+	const toolsListSection = deferredToolsListing.length > 0 ? `
 
 Deferred tools (search to load; \u2026 = has params, search first):
-${deferredToolsListing}`
-        : '';
-    const mcpNote = deferredToolsListing.includes(Constants.MCP_DELIMITER) ||
-        deferredToolsListing.split('\n').some((line) => !line.startsWith('other:'))
-        ? `
-- MCP tools use format: toolName${Constants.MCP_DELIMITER}serverName
-- Use mcp_server param to filter by server`
-        : '';
-    const description = mode === 'local'
-        ? `
+${deferredToolsListing}` : "";
+	const mcpNote = deferredToolsListing.includes("_mcp_") || deferredToolsListing.split("\n").some((line) => !line.startsWith("other:")) ? `
+- MCP tools use format: toolName_mcp_serverName
+- Use mcp_server param to filter by server` : "";
+	return tool(async (rawParams, config) => {
+		const { query = "", fields = ["name", "description"], max_results = DEFAULT_MAX_RESULTS, mcp_server } = rawParams;
+		const { toolRegistry: paramToolRegistry, onlyDeferred: paramOnlyDeferred, mcpServer: paramMcpServer } = config.toolCall ?? {};
+		const toolRegistry = paramToolRegistry ?? initParams.toolRegistry;
+		const onlyDeferred = paramOnlyDeferred !== void 0 ? paramOnlyDeferred : defaultOnlyDeferred;
+		const serverFilters = normalizeServerFilter(mcp_server ?? paramMcpServer ?? initParams.mcpServer);
+		const hasServerFilter = serverFilters.length > 0;
+		if (toolRegistry == null) return ["Error: No tool registry provided. Configure toolRegistry at agent level or initialization.", {
+			tool_references: [],
+			metadata: {
+				total_searched: 0,
+				pattern: query,
+				error: "No tool registry provided"
+			}
+		}];
+		const deferredTools = Array.from(toolRegistry.values()).filter((lcTool) => {
+			if (onlyDeferred === true && lcTool.defer_loading !== true) return false;
+			if (hasServerFilter && !isFromAnyMcpServer(lcTool.name, serverFilters)) return false;
+			return true;
+		}).map((lcTool) => ({
+			name: lcTool.name,
+			description: lcTool.description ?? "",
+			parameters: simplifyParametersForSearch(lcTool.parameters)
+		}));
+		if (deferredTools.length === 0) return [`No tools available to search${hasServerFilter ? ` from MCP server(s): ${serverFilters.join(", ")}` : ""}. The tool registry is empty or no matching deferred tools are registered.`, {
+			tool_references: [],
+			metadata: {
+				total_searched: 0,
+				pattern: query,
+				mcp_server: serverFilters
+			}
+		}];
+		if (hasServerFilter && query === "") return [formatServerListing(deferredTools, serverFilters, mcpNameFormat), {
+			tool_references: [],
+			metadata: {
+				total_available: deferredTools.length,
+				mcp_server: serverFilters,
+				listing_mode: true
+			}
+		}];
+		if (mode === "local") {
+			const searchResponse = performLocalSearch(deferredTools, query, fields, max_results);
+			return [formatSearchResults(searchResponse, mcpNameFormat), {
+				tool_references: searchResponse.tool_references,
+				metadata: {
+					total_searched: searchResponse.total_tools_searched,
+					pattern: searchResponse.pattern_used,
+					mcp_server: serverFilters.length > 0 ? serverFilters : void 0
+				}
+			}];
+		}
+		const { safe: sanitizedPattern, wasEscaped } = sanitizeRegex(query);
+		let warningMessage = "";
+		if (wasEscaped) warningMessage = "Note: The provided pattern was converted to a literal search for safety.\n\n";
+		const postData = {
+			lang: "js",
+			code: generateSearchScript(deferredTools, fields, max_results, sanitizedPattern),
+			timeout: SEARCH_TIMEOUT
+		};
+		try {
+			const fetchOptions = {
+				method: "POST",
+				headers: {
+					"Content-Type": "application/json",
+					"User-Agent": "LibreChat/1.0"
+				},
+				body: JSON.stringify(postData)
+			};
+			if (process.env.PROXY != null && process.env.PROXY !== "") fetchOptions.agent = new HttpsProxyAgent(process.env.PROXY);
+			const response = await fetch(EXEC_ENDPOINT, fetchOptions);
+			if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`);
+			const result = await response.json();
+			if (result.stderr && result.stderr.trim()) console.warn("[ToolSearch] stderr:", result.stderr);
+			if (!result.stdout || !result.stdout.trim()) return [`${warningMessage}No tools matched the pattern "${sanitizedPattern}".\nTotal tools searched: ${deferredTools.length}`, {
+				tool_references: [],
+				metadata: {
+					total_searched: deferredTools.length,
+					pattern: sanitizedPattern
+				}
+			}];
+			const searchResponse = parseSearchResults(result.stdout);
+			return [`${warningMessage}${formatSearchResults(searchResponse, mcpNameFormat)}`, {
+				tool_references: searchResponse.tool_references,
+				metadata: {
+					total_searched: searchResponse.total_tools_searched,
+					pattern: searchResponse.pattern_used
+				}
+			}];
+		} catch (error) {
+			console.error("[ToolSearch] Error:", error);
+			const errorMessage = error instanceof Error ? error.message : String(error);
+			return [`Tool search failed: ${errorMessage}\n\nSuggestion: Try a simpler search pattern or search for specific tool names.`, {
+				tool_references: [],
+				metadata: {
+					total_searched: 0,
+					pattern: sanitizedPattern,
+					error: errorMessage
+				}
+			}];
+		}
+	}, {
+		name: "tool_search",
+		description: mode === "local" ? `
 Searches deferred tools using BM25 ranking. Multi-word queries supported.
 ${mcpNote}${toolsListSection}
-`.trim()
-        : `
+`.trim() : `
 Searches deferred tools by regex pattern.
 ${mcpNote}${toolsListSection}
-`.trim();
-    return tool(async (rawParams, config) => {
-        const params = rawParams;
-        const { query = '', fields = ['name', 'description'], max_results = DEFAULT_MAX_RESULTS, mcp_server, } = params;
-        const { toolRegistry: paramToolRegistry, onlyDeferred: paramOnlyDeferred, mcpServer: paramMcpServer, } = config.toolCall ?? {};
-        const toolRegistry = paramToolRegistry ?? initParams.toolRegistry;
-        const onlyDeferred = paramOnlyDeferred !== undefined
-            ? paramOnlyDeferred
-            : defaultOnlyDeferred;
-        const rawServerFilter = mcp_server ?? paramMcpServer ?? initParams.mcpServer;
-        const serverFilters = normalizeServerFilter(rawServerFilter);
-        const hasServerFilter = serverFilters.length > 0;
-        if (toolRegistry == null) {
-            return [
-                'Error: No tool registry provided. Configure toolRegistry at agent level or initialization.',
-                {
-                    tool_references: [],
-                    metadata: {
-                        total_searched: 0,
-                        pattern: query,
-                        error: 'No tool registry provided',
-                    },
-                },
-            ];
-        }
-        const toolsArray = Array.from(toolRegistry.values());
-        const deferredTools = toolsArray
-            .filter((lcTool) => {
-            if (onlyDeferred === true && lcTool.defer_loading !== true) {
-                return false;
-            }
-            if (hasServerFilter &&
-                !isFromAnyMcpServer(lcTool.name, serverFilters)) {
-                return false;
-            }
-            return true;
-        })
-            .map((lcTool) => ({
-            name: lcTool.name,
-            description: lcTool.description ?? '',
-            parameters: simplifyParametersForSearch(lcTool.parameters),
-        }));
-        if (deferredTools.length === 0) {
-            const serverMsg = hasServerFilter
-                ? ` from MCP server(s): ${serverFilters.join(', ')}`
-                : '';
-            return [
-                `No tools available to search${serverMsg}. The tool registry is empty or no matching deferred tools are registered.`,
-                {
-                    tool_references: [],
-                    metadata: {
-                        total_searched: 0,
-                        pattern: query,
-                        mcp_server: serverFilters,
-                    },
-                },
-            ];
-        }
-        const isServerListing = hasServerFilter && query === '';
-        if (isServerListing) {
-            const formattedOutput = formatServerListing(deferredTools, serverFilters, mcpNameFormat);
-            return [
-                formattedOutput,
-                {
-                    tool_references: [],
-                    metadata: {
-                        total_available: deferredTools.length,
-                        mcp_server: serverFilters,
-                        listing_mode: true,
-                    },
-                },
-            ];
-        }
-        if (mode === 'local') {
-            const searchResponse = performLocalSearch(deferredTools, query, fields, max_results);
-            const formattedOutput = formatSearchResults(searchResponse, mcpNameFormat);
-            return [
-                formattedOutput,
-                {
-                    tool_references: searchResponse.tool_references,
-                    metadata: {
-                        total_searched: searchResponse.total_tools_searched,
-                        pattern: searchResponse.pattern_used,
-                        mcp_server: serverFilters.length > 0 ? serverFilters : undefined,
-                    },
-                },
-            ];
-        }
-        const { safe: sanitizedPattern, wasEscaped } = sanitizeRegex(query);
-        let warningMessage = '';
-        if (wasEscaped) {
-            warningMessage =
-                'Note: The provided pattern was converted to a literal search for safety.\n\n';
-        }
-        const searchScript = generateSearchScript(deferredTools, fields, max_results, sanitizedPattern);
-        const postData = {
-            lang: 'js',
-            code: searchScript,
-            timeout: SEARCH_TIMEOUT,
-        };
-        try {
-            const fetchOptions = {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    'User-Agent': 'LibreChat/1.0',
-                },
-                body: JSON.stringify(postData),
-            };
-            if (process.env.PROXY != null && process.env.PROXY !== '') {
-                fetchOptions.agent = new HttpsProxyAgent(process.env.PROXY);
-            }
-            const response = await fetch(EXEC_ENDPOINT, fetchOptions);
-            if (!response.ok) {
-                throw new Error(`HTTP error! status: ${response.status}`);
-            }
-            const result = await response.json();
-            if (result.stderr && result.stderr.trim()) {
-                // eslint-disable-next-line no-console
-                console.warn('[ToolSearch] stderr:', result.stderr);
-            }
-            if (!result.stdout || !result.stdout.trim()) {
-                return [
-                    `${warningMessage}No tools matched the pattern "${sanitizedPattern}".\nTotal tools searched: ${deferredTools.length}`,
-                    {
-                        tool_references: [],
-                        metadata: {
-                            total_searched: deferredTools.length,
-                            pattern: sanitizedPattern,
-                        },
-                    },
-                ];
-            }
-            const searchResponse = parseSearchResults(result.stdout);
-            const formattedOutput = `${warningMessage}${formatSearchResults(searchResponse, mcpNameFormat)}`;
-            return [
-                formattedOutput,
-                {
-                    tool_references: searchResponse.tool_references,
-                    metadata: {
-                        total_searched: searchResponse.total_tools_searched,
-                        pattern: searchResponse.pattern_used,
-                    },
-                },
-            ];
-        }
-        catch (error) {
-            // eslint-disable-next-line no-console
-            console.error('[ToolSearch] Error:', error);
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            return [
-                `Tool search failed: ${errorMessage}\n\nSuggestion: Try a simpler search pattern or search for specific tool names.`,
-                {
-                    tool_references: [],
-                    metadata: {
-                        total_searched: 0,
-                        pattern: sanitizedPattern,
-                        error: errorMessage,
-                    },
-                },
-            ];
-        }
-    }, {
-        name: Constants.TOOL_SEARCH,
-        description,
-        schema,
-        responseFormat: Constants.CONTENT_AND_ARTIFACT,
-    });
+`.trim(),
+		schema,
+		responseFormat: "content_and_artifact"
+	});
 }
-
+//#endregion
 export { ToolSearchToolDefinition, ToolSearchToolDescription, ToolSearchToolName, ToolSearchToolSchema, countNestedGroups, createToolSearch, escapeRegexSpecialChars, extractMcpServerName, formatServerListing, getAvailableMcpServers, getBaseToolName, getDeferredToolsListing, hasNestedQuantifiers, isDangerousPattern, isFromAnyMcpServer, isFromMcpServer, normalizeServerFilter, performLocalSearch, sanitizeRegex };
-//# sourceMappingURL=ToolSearch.mjs.map
+
+//# sourceMappingURL=ToolSearch.mjs.map