@librechat/agents 3.2.66 → 3.2.68

package/dist/esm/tools/search/tool.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"tool.mjs","names":["params"],"sources":["../../../../src/tools/search/tool.ts"],"sourcesContent":["import { tool, DynamicStructuredTool } from '@langchain/core/tools';\nimport type { RunnableConfig } from '@langchain/core/runnables';\nimport type * as t from './types';\nimport {\n  WebSearchToolDescription,\n  WebSearchToolName,\n  countrySchema,\n  imagesSchema,\n  videosSchema,\n  querySchema,\n  dateSchema,\n  newsSchema,\n  DATE_RANGE,\n} from './schema';\nimport { createSearchAPI, createSourceProcessor } from './search';\nimport { createSerperScraper } from './serper-scraper';\nimport { createTavilyScraper } from './tavily-scraper';\nimport { createFirecrawlScraper } from './firecrawl';\nimport { createCrwScraper } from './crw-scraper';\nimport { expandHighlights } from './highlights';\nimport { formatResultsForLLM } from './format';\nimport { createDefaultLogger } from './utils';\nimport { createReranker } from './rerankers';\nimport { Constants } from '@/common';\n\n/**\n * Executes parallel searches and merges the results,\n * deduplicating top stories by link\n */\nexport async function executeParallelSearches({\n  searchAPI,\n  query,\n  date,\n  country,\n  safeSearch,\n  images,\n  videos,\n  news,\n  logger,\n}: {\n  searchAPI: ReturnType<typeof createSearchAPI>;\n  query: string;\n  date?: DATE_RANGE;\n  country?: string;\n  safeSearch: t.SearchToolConfig['safeSearch'];\n  images: boolean;\n  videos: boolean;\n  news: boolean;\n  logger: t.Logger;\n}): Promise<t.SearchResult> {\n  // Prepare all search tasks to run in parallel\n  const searchTasks: Promise<t.SearchResult>[] = [\n    // Main search\n    searchAPI.getSources({\n      query,\n      date,\n      country,\n      safeSearch,\n    }),\n  ];\n\n  if (images) {\n    searchTasks.push(\n      searchAPI\n        .getSources({\n          query,\n          date,\n          country,\n          safeSearch,\n          type: 'images',\n        })\n        .catch((error) => {\n          logger.error('Error fetching images:', error);\n          return {\n            success: false,\n            error: `Images search failed: ${error instanceof Error ? error.message : String(error)}`,\n          };\n        })\n    );\n  }\n  if (videos) {\n    searchTasks.push(\n      searchAPI\n        .getSources({\n          query,\n          date,\n          country,\n          safeSearch,\n          type: 'videos',\n        })\n        .catch((error) => {\n          logger.error('Error fetching videos:', error);\n          return {\n            success: false,\n            error: `Videos search failed: ${error instanceof Error ? error.message : String(error)}`,\n          };\n        })\n    );\n  }\n  if (news) {\n    searchTasks.push(\n      searchAPI\n        .getSources({\n          query,\n          date,\n          country,\n          safeSearch,\n          type: 'news',\n        })\n        .catch((error) => {\n          logger.error('Error fetching news:', error);\n          return {\n            success: false,\n            error: `News search failed: ${error instanceof Error ? error.message : String(error)}`,\n          };\n        })\n    );\n  }\n\n  // Run all searches in parallel\n  const results = await Promise.all(searchTasks);\n\n  // Get the main search result (first result)\n  const mainResult = results[0];\n  if (!mainResult.success) {\n    throw new Error(mainResult.error ?? 'Search failed');\n  }\n\n  // Merge additional results with the main results\n  const mergedResults = { ...mainResult.data };\n\n  // Convert existing news to topStories if present\n  if (mergedResults.news !== undefined && mergedResults.news.length > 0) {\n    const existingNewsAsTopStories = mergedResults.news\n      .filter((newsItem) => newsItem.link !== undefined && newsItem.link !== '')\n      .map((newsItem) => ({\n        title: newsItem.title ?? '',\n        link: newsItem.link ?? '',\n        source: newsItem.source ?? '',\n        date: newsItem.date ?? '',\n        imageUrl: newsItem.imageUrl ?? '',\n        processed: false,\n      }));\n    mergedResults.topStories = [\n      ...(mergedResults.topStories ?? []),\n      ...existingNewsAsTopStories,\n    ];\n    delete mergedResults.news;\n  }\n\n  results.slice(1).forEach((result) => {\n    if (result.success && result.data !== undefined) {\n      if (result.data.images !== undefined && result.data.images.length > 0) {\n        mergedResults.images = [\n          ...(mergedResults.images ?? []),\n          ...result.data.images,\n        ];\n      }\n      if (result.data.videos !== undefined && result.data.videos.length > 0) {\n        mergedResults.videos = [\n          ...(mergedResults.videos ?? []),\n          ...result.data.videos,\n        ];\n      }\n      if (result.data.news !== undefined && result.data.news.length > 0) {\n        const newsAsTopStories = result.data.news.map((newsItem) => ({\n          ...newsItem,\n          link: newsItem.link ?? '',\n        }));\n        mergedResults.topStories = [\n          ...(mergedResults.topStories ?? []),\n          ...newsAsTopStories,\n        ];\n      }\n    }\n  });\n\n  if (\n    mergedResults.topStories !== undefined &&\n    mergedResults.topStories.length > 1\n  ) {\n    /** The main search's own news results and the parallel news sub-search\n     * frequently return the same stories — keep the first occurrence of each\n     * link so duplicates aren't scraped, reranked, and formatted repeatedly */\n    const seenLinks = new Set<string>();\n    mergedResults.topStories = mergedResults.topStories.filter((story) => {\n      if (!story.link || seenLinks.has(story.link)) {\n        return false;\n      }\n      seenLinks.add(story.link);\n      return true;\n    });\n  }\n\n  return { success: true, data: mergedResults };\n}\n\nfunction createSearchProcessor({\n  searchAPI,\n  safeSearch,\n  supportsImages,\n  supportsVideos,\n  supportsNews,\n  sourceProcessor,\n  onGetHighlights,\n  logger,\n}: {\n  safeSearch: t.SearchToolConfig['safeSearch'];\n  supportsImages: boolean;\n  supportsVideos: boolean;\n  supportsNews: boolean;\n  searchAPI: ReturnType<typeof createSearchAPI>;\n  sourceProcessor: ReturnType<typeof createSourceProcessor>;\n  onGetHighlights: t.SearchToolConfig['onGetHighlights'];\n  logger: t.Logger;\n}) {\n  return async function ({\n    query,\n    date,\n    country,\n    proMode = true,\n    maxSources = 5,\n    onSearchResults,\n    images = false,\n    videos = false,\n    news = false,\n  }: {\n    query: string;\n    country?: string;\n    date?: DATE_RANGE;\n    proMode?: boolean;\n    maxSources?: number;\n    onSearchResults: t.SearchToolConfig['onSearchResults'];\n    images?: boolean;\n    videos?: boolean;\n    news?: boolean;\n  }): Promise<t.SearchResultData> {\n    try {\n      // Execute parallel searches and merge results\n      const searchResult = await executeParallelSearches({\n        searchAPI,\n        query,\n        date,\n        country,\n        safeSearch,\n        images: supportsImages && images,\n        videos: supportsVideos && videos,\n        news: supportsNews && news,\n        logger,\n      });\n\n      onSearchResults?.(searchResult);\n\n      const processedSources = await sourceProcessor.processSources({\n        query,\n        news,\n        result: searchResult,\n        proMode,\n        onGetHighlights,\n        numElements: maxSources,\n      });\n\n      return expandHighlights(processedSources);\n    } catch (error) {\n      logger.error('Error in search:', error);\n      return {\n        organic: [],\n        topStories: [],\n        images: [],\n        videos: [],\n        news: [],\n        relatedSearches: [],\n        error: error instanceof Error ? error.message : String(error),\n      };\n    }\n  };\n}\n\nfunction createOnSearchResults({\n  runnableConfig,\n  onSearchResults,\n}: {\n  runnableConfig: RunnableConfig;\n  onSearchResults: t.SearchToolConfig['onSearchResults'];\n}) {\n  return function (results: t.SearchResult): void {\n    if (!onSearchResults) {\n      return;\n    }\n    onSearchResults(results, runnableConfig);\n  };\n}\n\nfunction createTool({\n  schema,\n  search,\n  maxOutputChars,\n  onSearchResults: _onSearchResults,\n}: {\n  schema: Record<string, unknown>;\n  search: ReturnType<typeof createSearchProcessor>;\n  maxOutputChars?: number;\n  onSearchResults: t.SearchToolConfig['onSearchResults'];\n}): DynamicStructuredTool {\n  return tool(\n    async (rawParams, runnableConfig) => {\n      const params = rawParams as SearchToolParams;\n      const { query, date, country: _c, images, videos, news } = params;\n      const country = typeof _c === 'string' && _c ? _c : undefined;\n      const searchResult = await search({\n        query,\n        date,\n        country,\n        images,\n        videos,\n        news,\n        onSearchResults: createOnSearchResults({\n          runnableConfig,\n          onSearchResults: _onSearchResults,\n        }),\n      });\n      const turn = runnableConfig.toolCall?.turn ?? 0;\n      const { output, references } = formatResultsForLLM(\n        turn,\n        searchResult,\n        maxOutputChars\n      );\n      const data: t.SearchResultData = { turn, ...searchResult, references };\n      return [output, { [Constants.WEB_SEARCH]: data }];\n    },\n    {\n      name: WebSearchToolName,\n      description: WebSearchToolDescription,\n      schema: schema,\n      responseFormat: Constants.CONTENT_AND_ARTIFACT,\n    }\n  );\n}\n\n/**\n * Creates a search tool with configurable search and scraper providers.\n *\n * Search providers: Serper (Google results), SearXNG (self-hosted meta-search), Tavily (AI-optimized), fastCRW (Firecrawl-compatible, self-host or cloud).\n * Scraper providers: Firecrawl (default, full-featured), Serper (lightweight), Tavily (batch extraction), fastCRW (Firecrawl-compatible, self-host or cloud).\n *\n * The country schema field is exposed to the LLM for providers that support localized results.\n */\n/** Input params type for search tool */\ninterface SearchToolParams {\n  query: string;\n  date?: DATE_RANGE;\n  country?: string;\n  images?: boolean;\n  videos?: boolean;\n  news?: boolean;\n}\n\nexport const createSearchTool = (\n  config: t.SearchToolConfig = {}\n): DynamicStructuredTool => {\n  const {\n    searchProvider = 'serper',\n    serperApiKey,\n    searxngInstanceUrl,\n    searxngApiKey,\n    tavilyApiKey,\n    tavilySearchUrl,\n    tavilyExtractUrl,\n    tavilySearchOptions,\n    keenableApiKey,\n    keenableApiUrl,\n    keenableSearchOptions,\n    rerankerType = 'cohere',\n    rerankerTimeout,\n    topResults = 5,\n    maxContentLength,\n    chunkSize,\n    chunkOverlap,\n    maxOutputChars,\n    strategies = ['no_extraction'],\n    filterContent = true,\n    safeSearch = 1,\n    scraperProvider = 'firecrawl',\n    firecrawlApiKey,\n    firecrawlApiUrl,\n    firecrawlVersion,\n    firecrawlOptions,\n    serperScraperOptions,\n    tavilyScraperOptions,\n    crwApiKey,\n    crwApiUrl,\n    crwSearchOptions,\n    crwScraperOptions,\n    scraperTimeout,\n    jinaApiKey,\n    jinaApiUrl,\n    cohereApiKey,\n    onSearchResults: _onSearchResults,\n    onGetHighlights,\n  } = config;\n\n  const logger = config.logger || createDefaultLogger();\n  const effectiveTavilySearchOptions =\n    searchProvider === 'tavily' && config.safeSearch != null\n      ? {\n        ...tavilySearchOptions,\n        safeSearch: config.safeSearch !== 0,\n      }\n      : tavilySearchOptions;\n\n  const schemaProperties: Record<string, unknown> = {\n    query: querySchema,\n    date: dateSchema,\n    images: imagesSchema,\n    videos: videosSchema,\n    news: newsSchema,\n  };\n\n  if (searchProvider === 'serper' || searchProvider === 'tavily') {\n    schemaProperties.country = countrySchema;\n  }\n\n  const toolSchema = {\n    type: 'object',\n    properties: schemaProperties,\n    required: ['query'],\n  };\n\n  const searchAPI = createSearchAPI({\n    searchProvider,\n    serperApiKey,\n    searxngInstanceUrl,\n    searxngApiKey,\n    tavilyApiKey,\n    tavilySearchUrl,\n    tavilySearchOptions: effectiveTavilySearchOptions,\n    keenableApiKey,\n    keenableApiUrl,\n    keenableSearchOptions,\n    crwApiKey,\n    crwApiUrl,\n    crwSearchOptions,\n  });\n\n  /** Create scraper based on scraperProvider */\n  let scraperInstance: t.BaseScraper;\n\n  if (scraperProvider === 'serper') {\n    scraperInstance = createSerperScraper({\n      ...serperScraperOptions,\n      apiKey: serperApiKey,\n      timeout: scraperTimeout ?? serperScraperOptions?.timeout,\n      logger,\n    });\n  } else if (scraperProvider === 'tavily') {\n    scraperInstance = createTavilyScraper({\n      ...tavilyScraperOptions,\n      apiKey:\n        tavilyScraperOptions?.apiKey ??\n        tavilyApiKey ??\n        process.env.TAVILY_API_KEY,\n      apiUrl: tavilyScraperOptions?.apiUrl ?? tavilyExtractUrl,\n      timeout: scraperTimeout ?? tavilyScraperOptions?.timeout,\n      logger,\n    });\n  } else if (scraperProvider === 'crw') {\n    scraperInstance = createCrwScraper({\n      ...crwScraperOptions,\n      apiKey:\n        crwScraperOptions?.apiKey ?? crwApiKey ?? process.env.CRW_API_KEY,\n      apiUrl: crwScraperOptions?.apiUrl ?? crwApiUrl,\n      timeout: scraperTimeout ?? crwScraperOptions?.timeout,\n      formats: crwScraperOptions?.formats ?? ['markdown', 'rawHtml'],\n      logger,\n    });\n  } else {\n    scraperInstance = createFirecrawlScraper({\n      ...firecrawlOptions,\n      apiKey: firecrawlApiKey ?? process.env.FIRECRAWL_API_KEY,\n      apiUrl: firecrawlApiUrl,\n      version: firecrawlVersion,\n      timeout: scraperTimeout ?? firecrawlOptions?.timeout,\n      formats: firecrawlOptions?.formats ?? ['markdown', 'rawHtml'],\n      logger,\n    });\n  }\n\n  const selectedReranker = createReranker({\n    rerankerType,\n    jinaApiKey,\n    jinaApiUrl,\n    cohereApiKey,\n    rerankerTimeout,\n    logger,\n  });\n\n  if (!selectedReranker) {\n    logger.warn('No reranker selected. Using default ranking.');\n  }\n\n  const sourceProcessor = createSourceProcessor(\n    {\n      reranker: selectedReranker,\n      topResults,\n      maxContentLength,\n      chunkSize,\n      chunkOverlap,\n      strategies,\n      filterContent,\n      logger,\n    },\n    scraperInstance\n  );\n\n  const search = createSearchProcessor({\n    searchAPI,\n    safeSearch,\n    // Keenable is organic-only: its API ignores `type`, so image/news\n    // sub-searches would spend rate limit and merge nothing.\n    supportsImages: searchProvider !== 'keenable',\n    supportsVideos:\n      searchProvider !== 'tavily' &&\n      searchProvider !== 'keenable' &&\n      searchProvider !== 'crw',\n    supportsNews: searchProvider !== 'keenable',\n    sourceProcessor,\n    onGetHighlights,\n    logger,\n  });\n\n  return createTool({\n    search,\n    schema: toolSchema,\n    maxOutputChars,\n    onSearchResults: _onSearchResults,\n  });\n};\n"],"mappings":"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"}
+{"version":3,"file":"tool.mjs","names":["params"],"sources":["../../../../src/tools/search/tool.ts"],"sourcesContent":["import { tool, DynamicStructuredTool } from '@langchain/core/tools';\nimport type { RunnableConfig } from '@langchain/core/runnables';\nimport type * as t from './types';\nimport {\n  WebSearchToolDescription,\n  WebSearchToolName,\n  countrySchema,\n  imagesSchema,\n  videosSchema,\n  querySchema,\n  dateSchema,\n  newsSchema,\n  DATE_RANGE,\n} from './schema';\nimport { createSearchAPI, createSourceProcessor } from './search';\nimport { createSerperScraper } from './serper-scraper';\nimport { createTavilyScraper } from './tavily-scraper';\nimport { createFirecrawlScraper } from './firecrawl';\nimport { createCrwScraper } from './crw-scraper';\nimport { expandHighlights } from './highlights';\nimport { formatResultsForLLM } from './format';\nimport { createDefaultLogger } from './utils';\nimport { createReranker } from './rerankers';\nimport { Constants } from '@/common';\n\n/**\n * Executes parallel searches and merges the results,\n * deduplicating top stories by link\n */\nexport async function executeParallelSearches({\n  searchAPI,\n  query,\n  date,\n  country,\n  safeSearch,\n  images,\n  videos,\n  news,\n  logger,\n}: {\n  searchAPI: ReturnType<typeof createSearchAPI>;\n  query: string;\n  date?: DATE_RANGE;\n  country?: string;\n  safeSearch: t.SearchToolConfig['safeSearch'];\n  images: boolean;\n  videos: boolean;\n  news: boolean;\n  logger: t.Logger;\n}): Promise<t.SearchResult> {\n  // Prepare all search tasks to run in parallel\n  const searchTasks: Promise<t.SearchResult>[] = [\n    // Main search\n    searchAPI.getSources({\n      query,\n      date,\n      country,\n      safeSearch,\n    }),\n  ];\n\n  if (images) {\n    searchTasks.push(\n      searchAPI\n        .getSources({\n          query,\n          date,\n          country,\n          safeSearch,\n          type: 'images',\n        })\n        .catch((error) => {\n          logger.error('Error fetching images:', error);\n          return {\n            success: false,\n            error: `Images search failed: ${error instanceof Error ? error.message : String(error)}`,\n          };\n        })\n    );\n  }\n  if (videos) {\n    searchTasks.push(\n      searchAPI\n        .getSources({\n          query,\n          date,\n          country,\n          safeSearch,\n          type: 'videos',\n        })\n        .catch((error) => {\n          logger.error('Error fetching videos:', error);\n          return {\n            success: false,\n            error: `Videos search failed: ${error instanceof Error ? error.message : String(error)}`,\n          };\n        })\n    );\n  }\n  if (news) {\n    searchTasks.push(\n      searchAPI\n        .getSources({\n          query,\n          date,\n          country,\n          safeSearch,\n          type: 'news',\n        })\n        .catch((error) => {\n          logger.error('Error fetching news:', error);\n          return {\n            success: false,\n            error: `News search failed: ${error instanceof Error ? error.message : String(error)}`,\n          };\n        })\n    );\n  }\n\n  // Run all searches in parallel\n  const results = await Promise.all(searchTasks);\n\n  // Get the main search result (first result)\n  const mainResult = results[0];\n  if (!mainResult.success) {\n    throw new Error(mainResult.error ?? 'Search failed');\n  }\n\n  // Merge additional results with the main results\n  const mergedResults = { ...mainResult.data };\n\n  // Convert existing news to topStories if present\n  if (mergedResults.news !== undefined && mergedResults.news.length > 0) {\n    const existingNewsAsTopStories = mergedResults.news\n      .filter((newsItem) => newsItem.link !== undefined && newsItem.link !== '')\n      .map((newsItem) => ({\n        title: newsItem.title ?? '',\n        link: newsItem.link ?? '',\n        source: newsItem.source ?? '',\n        date: newsItem.date ?? '',\n        imageUrl: newsItem.imageUrl ?? '',\n        processed: false,\n      }));\n    mergedResults.topStories = [\n      ...(mergedResults.topStories ?? []),\n      ...existingNewsAsTopStories,\n    ];\n    delete mergedResults.news;\n  }\n\n  results.slice(1).forEach((result) => {\n    if (result.success && result.data !== undefined) {\n      if (result.data.images !== undefined && result.data.images.length > 0) {\n        mergedResults.images = [\n          ...(mergedResults.images ?? []),\n          ...result.data.images,\n        ];\n      }\n      if (result.data.videos !== undefined && result.data.videos.length > 0) {\n        mergedResults.videos = [\n          ...(mergedResults.videos ?? []),\n          ...result.data.videos,\n        ];\n      }\n      if (result.data.news !== undefined && result.data.news.length > 0) {\n        const newsAsTopStories = result.data.news.map((newsItem) => ({\n          ...newsItem,\n          link: newsItem.link ?? '',\n        }));\n        mergedResults.topStories = [\n          ...(mergedResults.topStories ?? []),\n          ...newsAsTopStories,\n        ];\n      }\n    }\n  });\n\n  if (\n    mergedResults.topStories !== undefined &&\n    mergedResults.topStories.length > 1\n  ) {\n    /** The main search's own news results and the parallel news sub-search\n     * frequently return the same stories — keep the first occurrence of each\n     * link so duplicates aren't scraped, reranked, and formatted repeatedly */\n    const seenLinks = new Set<string>();\n    mergedResults.topStories = mergedResults.topStories.filter((story) => {\n      if (!story.link || seenLinks.has(story.link)) {\n        return false;\n      }\n      seenLinks.add(story.link);\n      return true;\n    });\n  }\n\n  return { success: true, data: mergedResults };\n}\n\nfunction createSearchProcessor({\n  searchAPI,\n  safeSearch,\n  supportsImages,\n  supportsVideos,\n  supportsNews,\n  sourceProcessor,\n  onGetHighlights,\n  mainExpandBy,\n  separatorExpandBy,\n  logger,\n}: {\n  safeSearch: t.SearchToolConfig['safeSearch'];\n  supportsImages: boolean;\n  supportsVideos: boolean;\n  supportsNews: boolean;\n  searchAPI: ReturnType<typeof createSearchAPI>;\n  sourceProcessor: ReturnType<typeof createSourceProcessor>;\n  onGetHighlights: t.SearchToolConfig['onGetHighlights'];\n  mainExpandBy: t.SearchToolConfig['mainExpandBy'];\n  separatorExpandBy: t.SearchToolConfig['separatorExpandBy'];\n  logger: t.Logger;\n}) {\n  return async function ({\n    query,\n    date,\n    country,\n    proMode = true,\n    maxSources = 5,\n    onSearchResults,\n    images = false,\n    videos = false,\n    news = false,\n  }: {\n    query: string;\n    country?: string;\n    date?: DATE_RANGE;\n    proMode?: boolean;\n    maxSources?: number;\n    onSearchResults: t.SearchToolConfig['onSearchResults'];\n    images?: boolean;\n    videos?: boolean;\n    news?: boolean;\n  }): Promise<t.SearchResultData> {\n    try {\n      // Execute parallel searches and merge results\n      const searchResult = await executeParallelSearches({\n        searchAPI,\n        query,\n        date,\n        country,\n        safeSearch,\n        images: supportsImages && images,\n        videos: supportsVideos && videos,\n        news: supportsNews && news,\n        logger,\n      });\n\n      onSearchResults?.(searchResult);\n\n      const processedSources = await sourceProcessor.processSources({\n        query,\n        news,\n        result: searchResult,\n        proMode,\n        onGetHighlights,\n        numElements: maxSources,\n      });\n\n      return expandHighlights(\n        processedSources,\n        mainExpandBy,\n        separatorExpandBy\n      );\n    } catch (error) {\n      logger.error('Error in search:', error);\n      return {\n        organic: [],\n        topStories: [],\n        images: [],\n        videos: [],\n        news: [],\n        relatedSearches: [],\n        error: error instanceof Error ? error.message : String(error),\n      };\n    }\n  };\n}\n\nfunction createOnSearchResults({\n  runnableConfig,\n  onSearchResults,\n}: {\n  runnableConfig: RunnableConfig;\n  onSearchResults: t.SearchToolConfig['onSearchResults'];\n}) {\n  return function (results: t.SearchResult): void {\n    if (!onSearchResults) {\n      return;\n    }\n    onSearchResults(results, runnableConfig);\n  };\n}\n\nfunction createTool({\n  schema,\n  search,\n  maxOutputChars,\n  onSearchResults: _onSearchResults,\n}: {\n  schema: Record<string, unknown>;\n  search: ReturnType<typeof createSearchProcessor>;\n  maxOutputChars?: number;\n  onSearchResults: t.SearchToolConfig['onSearchResults'];\n}): DynamicStructuredTool {\n  return tool(\n    async (rawParams, runnableConfig) => {\n      const params = rawParams as SearchToolParams;\n      const { query, date, country: _c, images, videos, news } = params;\n      const country = typeof _c === 'string' && _c ? _c : undefined;\n      const searchResult = await search({\n        query,\n        date,\n        country,\n        images,\n        videos,\n        news,\n        onSearchResults: createOnSearchResults({\n          runnableConfig,\n          onSearchResults: _onSearchResults,\n        }),\n      });\n      const turn = runnableConfig.toolCall?.turn ?? 0;\n      const { output, references } = formatResultsForLLM(\n        turn,\n        searchResult,\n        maxOutputChars\n      );\n      const data: t.SearchResultData = { turn, ...searchResult, references };\n      return [output, { [Constants.WEB_SEARCH]: data }];\n    },\n    {\n      name: WebSearchToolName,\n      description: WebSearchToolDescription,\n      schema: schema,\n      responseFormat: Constants.CONTENT_AND_ARTIFACT,\n    }\n  );\n}\n\n/**\n * Creates a search tool with configurable search and scraper providers.\n *\n * Search providers: Serper (Google results), SearXNG (self-hosted meta-search), Tavily (AI-optimized), fastCRW (Firecrawl-compatible, self-host or cloud).\n * Scraper providers: Firecrawl (default, full-featured), Serper (lightweight), Tavily (batch extraction), fastCRW (Firecrawl-compatible, self-host or cloud).\n *\n * The country schema field is exposed to the LLM for providers that support localized results.\n */\n/** Input params type for search tool */\ninterface SearchToolParams {\n  query: string;\n  date?: DATE_RANGE;\n  country?: string;\n  images?: boolean;\n  videos?: boolean;\n  news?: boolean;\n}\n\nexport const createSearchTool = (\n  config: t.SearchToolConfig = {}\n): DynamicStructuredTool => {\n  const {\n    searchProvider = 'serper',\n    serperApiKey,\n    searxngInstanceUrl,\n    searxngApiKey,\n    tavilyApiKey,\n    tavilySearchUrl,\n    tavilyExtractUrl,\n    tavilySearchOptions,\n    keenableApiKey,\n    keenableApiUrl,\n    keenableSearchOptions,\n    rerankerType = 'cohere',\n    rerankerTimeout,\n    topResults = 5,\n    maxContentLength,\n    chunkSize,\n    chunkOverlap,\n    mainExpandBy,\n    separatorExpandBy,\n    maxOutputChars,\n    strategies = ['no_extraction'],\n    filterContent = true,\n    safeSearch = 1,\n    scraperProvider = 'firecrawl',\n    firecrawlApiKey,\n    firecrawlApiUrl,\n    firecrawlVersion,\n    firecrawlOptions,\n    serperScraperOptions,\n    tavilyScraperOptions,\n    crwApiKey,\n    crwApiUrl,\n    crwSearchOptions,\n    crwScraperOptions,\n    scraperTimeout,\n    jinaApiKey,\n    jinaApiUrl,\n    cohereApiKey,\n    onSearchResults: _onSearchResults,\n    onGetHighlights,\n  } = config;\n\n  const logger = config.logger || createDefaultLogger();\n  const effectiveTavilySearchOptions =\n    searchProvider === 'tavily' && config.safeSearch != null\n      ? {\n        ...tavilySearchOptions,\n        safeSearch: config.safeSearch !== 0,\n      }\n      : tavilySearchOptions;\n\n  const schemaProperties: Record<string, unknown> = {\n    query: querySchema,\n    date: dateSchema,\n    images: imagesSchema,\n    videos: videosSchema,\n    news: newsSchema,\n  };\n\n  if (searchProvider === 'serper' || searchProvider === 'tavily') {\n    schemaProperties.country = countrySchema;\n  }\n\n  const toolSchema = {\n    type: 'object',\n    properties: schemaProperties,\n    required: ['query'],\n  };\n\n  const searchAPI = createSearchAPI({\n    searchProvider,\n    serperApiKey,\n    searxngInstanceUrl,\n    searxngApiKey,\n    tavilyApiKey,\n    tavilySearchUrl,\n    tavilySearchOptions: effectiveTavilySearchOptions,\n    keenableApiKey,\n    keenableApiUrl,\n    keenableSearchOptions,\n    crwApiKey,\n    crwApiUrl,\n    crwSearchOptions,\n  });\n\n  /** Create scraper based on scraperProvider */\n  let scraperInstance: t.BaseScraper;\n\n  if (scraperProvider === 'serper') {\n    scraperInstance = createSerperScraper({\n      ...serperScraperOptions,\n      apiKey: serperApiKey,\n      timeout: scraperTimeout ?? serperScraperOptions?.timeout,\n      logger,\n    });\n  } else if (scraperProvider === 'tavily') {\n    scraperInstance = createTavilyScraper({\n      ...tavilyScraperOptions,\n      apiKey:\n        tavilyScraperOptions?.apiKey ??\n        tavilyApiKey ??\n        process.env.TAVILY_API_KEY,\n      apiUrl: tavilyScraperOptions?.apiUrl ?? tavilyExtractUrl,\n      timeout: scraperTimeout ?? tavilyScraperOptions?.timeout,\n      logger,\n    });\n  } else if (scraperProvider === 'crw') {\n    scraperInstance = createCrwScraper({\n      ...crwScraperOptions,\n      apiKey:\n        crwScraperOptions?.apiKey ?? crwApiKey ?? process.env.CRW_API_KEY,\n      apiUrl: crwScraperOptions?.apiUrl ?? crwApiUrl,\n      timeout: scraperTimeout ?? crwScraperOptions?.timeout,\n      formats: crwScraperOptions?.formats ?? ['markdown', 'rawHtml'],\n      logger,\n    });\n  } else {\n    scraperInstance = createFirecrawlScraper({\n      ...firecrawlOptions,\n      apiKey: firecrawlApiKey ?? process.env.FIRECRAWL_API_KEY,\n      apiUrl: firecrawlApiUrl,\n      version: firecrawlVersion,\n      timeout: scraperTimeout ?? firecrawlOptions?.timeout,\n      formats: firecrawlOptions?.formats ?? ['markdown', 'rawHtml'],\n      logger,\n    });\n  }\n\n  const selectedReranker = createReranker({\n    rerankerType,\n    jinaApiKey,\n    jinaApiUrl,\n    cohereApiKey,\n    rerankerTimeout,\n    logger,\n  });\n\n  if (!selectedReranker) {\n    logger.warn('No reranker selected. Using default ranking.');\n  }\n\n  const sourceProcessor = createSourceProcessor(\n    {\n      reranker: selectedReranker,\n      topResults,\n      maxContentLength,\n      chunkSize,\n      chunkOverlap,\n      strategies,\n      filterContent,\n      logger,\n    },\n    scraperInstance\n  );\n\n  const search = createSearchProcessor({\n    searchAPI,\n    safeSearch,\n    // Keenable is organic-only: its API ignores `type`, so image/news\n    // sub-searches would spend rate limit and merge nothing.\n    supportsImages: searchProvider !== 'keenable',\n    supportsVideos:\n      searchProvider !== 'tavily' &&\n      searchProvider !== 'keenable' &&\n      searchProvider !== 'crw',\n    supportsNews: searchProvider !== 'keenable',\n    sourceProcessor,\n    onGetHighlights,\n    mainExpandBy,\n    separatorExpandBy,\n    logger,\n  });\n\n  return createTool({\n    search,\n    schema: toolSchema,\n    maxOutputChars,\n    onSearchResults: _onSearchResults,\n  });\n};\n"],"mappings":"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"}

package/dist/types/hooks/createToolPolicyHook.d.ts

@@ -3,11 +3,11 @@
  * permission policies (allow / deny / ask lists + a global mode) without
  * hand-rolling matching, precedence, and decision logic per-host.
  *
- * Maps directly to the Claude Code Agent SDK permission vocabulary
- * (`allowed_tools` / `disallowed_tools` / `permissionMode`) so users of
- * either SDK can think in the same terms. See the README's HITL section
- * for the cross-walk and `docs/hooks-design-report.md` for the broader
- * hook system context.
+ * Uses the Claude Code Agent SDK permission vocabulary (`allowed_tools` /
+ * `disallowed_tools` / `permissionMode`) while treating modes as fallbacks
+ * for calls that match no explicit rule. See the README's HITL section for
+ * the cross-walk and `docs/hooks-design-report.md` for the broader hook
+ * system context.
  */
 import type { HookCallback } from './types';
 /**
@@ -18,10 +18,8 @@ import type { HookCallback } from './types';
  *   - `dontAsk`  — unmatched tools are denied; the human is never
  *                  prompted. Useful for headless / API agents where a
  *                  silent denial is preferable to a hung interrupt.
- *   - `bypass`   — every tool is approved, except those matching `deny`
- *                  patterns. The kill switch you flip when you trust
- *                  the agent and want to stop being asked. Equivalent to
- *                  Claude Code's `bypassPermissions`.
+ *   - `bypass`   — unmatched tools are approved. Explicit `deny` and `ask`
+ *                  rules still apply.
  */
 export type ToolPolicyMode = 'default' | 'dontAsk' | 'bypass';
 export interface ToolPolicyConfig {
@@ -43,9 +41,8 @@ export interface ToolPolicyConfig {
      */
     deny?: readonly string[];
     /**
-     * Tool name patterns that always trigger human approval, regardless
-     * of `mode: 'default'` vs `'dontAsk'`. In `mode: 'bypass'` these are
-     * still bypassed (because that's what bypass means).
+     * Tool name patterns that always trigger human approval. Wins over
+     * `allow` and every mode, but not `deny`.
      */
     ask?: readonly string[];
     /**
@@ -70,12 +67,12 @@ export interface ToolPolicyConfig {
  * registry.register('PreToolUse', { hooks: [policyHook] });
  * ```
  *
- * Evaluation order matches Claude Code's permission flow:
+ * Explicit rules take precedence over fallback modes:
  *
  *   1. `deny` rule match → `'deny'` (always wins, even in `bypass`).
- *   2. `mode === 'bypass'` → `'allow'`.
+ *   2. `ask` rule match → `'ask'`.
  *   3. `allow` rule match → `'allow'`.
- *   4. `ask` rule match → `'ask'`.
+ *   4. `mode === 'bypass'` → `'allow'`.
  *   5. `mode === 'dontAsk'` → `'deny'`.
  *   6. fallthrough → `'ask'`.
  *

package/dist/types/llm/google/utils/common.d.ts

@@ -21,6 +21,15 @@ export declare function getMessageAuthor(message: BaseMessage): string;
 export declare function convertAuthorToRole(author: string): (typeof POSSIBLE_ROLES)[number];
 export declare function convertMessageContentToParts(message: BaseMessage, isMultimodalModel: boolean, previousMessages: BaseMessage[], model?: string): Part[];
 export declare function convertBaseMessagesToContent(messages: BaseMessage[], isMultimodalModel: boolean, convertSystemMessageToHumanContent?: boolean, model?: string): Content[] | undefined;
+export declare function rejectsModelTurnPrefill(model?: string): boolean;
+/**
+ * Drops trailing `model`-role turns for models that reject prefill (see
+ * {@link rejectsModelTurnPrefill}). Such a turn is only produced by prefill
+ * flows (e.g. editing an assistant reply and resubmitting); these models return
+ * HTTP 400 for it, so we drop it and let the model generate fresh from the
+ * preceding user turn. No-op for every other model, preserving working prefill.
+ */
+export declare function dropUnsupportedModelTurnPrefill(contents: Content[] | undefined, model?: string): Content[] | undefined;
 export declare function convertResponseContentToChatGenerationChunk(response: EnhancedGenerateContentResponse, extra: {
     usageMetadata?: UsageMetadata | undefined;
     index: number;

package/dist/types/tools/search/types.d.ts

@@ -200,6 +200,8 @@ export interface ProcessSourcesConfig {
      * configurable via the `SEARCH_CHUNK_OVERLAP` env var. Clamped below
      * `chunkSize`. */
     chunkOverlap?: number;
+    mainExpandBy?: number;
+    separatorExpandBy?: number;
     strategies?: string[];
     filterContent?: boolean;
     reranker?: BaseReranker;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@librechat/agents",
-  "version": "3.2.66",
+  "version": "3.2.68",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/esm/main.mjs",
   "types": "./dist/types/index.d.ts",

package/src/hooks/__tests__/createToolPolicyHook.test.ts

@@ -98,12 +98,12 @@ describe('createToolPolicyHook — bypass mode', () => {
     expect((await callHook(hook, 'read_file')).decision).toBe('allow');
   });
 
-  it('overrides explicit ask patterns (bypass means stop asking)', async () => {
+  it('still asks tools that match an explicit ask pattern', async () => {
     const hook = createToolPolicyHook({
       mode: 'bypass',
       ask: ['execute_*'],
     });
-    expect((await callHook(hook, 'execute_code')).decision).toBe('allow');
+    expect((await callHook(hook, 'execute_code')).decision).toBe('ask');
   });
 });
 
@@ -154,6 +154,15 @@ describe('createToolPolicyHook — pattern matching', () => {
 });
 
 describe('createToolPolicyHook — precedence', () => {
+  it('deny wins over ask', async () => {
+    const hook = createToolPolicyHook({
+      mode: 'default',
+      deny: ['execute_delete'],
+      ask: ['execute_*'],
+    });
+    expect((await callHook(hook, 'execute_delete')).decision).toBe('deny');
+  });
+
   it('deny wins over allow', async () => {
     const hook = createToolPolicyHook({
       mode: 'default',
@@ -173,13 +182,13 @@ describe('createToolPolicyHook — precedence', () => {
     expect((await callHook(hook, 'anything_else')).decision).toBe('allow');
   });
 
-  it('allow wins over ask in default mode', async () => {
+  it('ask wins over allow in default mode', async () => {
     const hook = createToolPolicyHook({
       mode: 'default',
       allow: ['execute_safe'],
       ask: ['execute_*'],
     });
-    expect((await callHook(hook, 'execute_safe')).decision).toBe('allow');
+    expect((await callHook(hook, 'execute_safe')).decision).toBe('ask');
     expect((await callHook(hook, 'execute_dangerous')).decision).toBe('ask');
   });
 });

package/src/hooks/createToolPolicyHook.ts

@@ -3,11 +3,11 @@
  * permission policies (allow / deny / ask lists + a global mode) without
  * hand-rolling matching, precedence, and decision logic per-host.
  *
- * Maps directly to the Claude Code Agent SDK permission vocabulary
- * (`allowed_tools` / `disallowed_tools` / `permissionMode`) so users of
- * either SDK can think in the same terms. See the README's HITL section
- * for the cross-walk and `docs/hooks-design-report.md` for the broader
- * hook system context.
+ * Uses the Claude Code Agent SDK permission vocabulary (`allowed_tools` /
+ * `disallowed_tools` / `permissionMode`) while treating modes as fallbacks
+ * for calls that match no explicit rule. See the README's HITL section for
+ * the cross-walk and `docs/hooks-design-report.md` for the broader hook
+ * system context.
  */
 
 import type { HookCallback, PreToolUseHookOutput, ToolDecision } from './types';
@@ -20,10 +20,8 @@ import type { HookCallback, PreToolUseHookOutput, ToolDecision } from './types';
  *   - `dontAsk`  — unmatched tools are denied; the human is never
  *                  prompted. Useful for headless / API agents where a
  *                  silent denial is preferable to a hung interrupt.
- *   - `bypass`   — every tool is approved, except those matching `deny`
- *                  patterns. The kill switch you flip when you trust
- *                  the agent and want to stop being asked. Equivalent to
- *                  Claude Code's `bypassPermissions`.
+ *   - `bypass`   — unmatched tools are approved. Explicit `deny` and `ask`
+ *                  rules still apply.
  */
 export type ToolPolicyMode = 'default' | 'dontAsk' | 'bypass';
 
@@ -46,9 +44,8 @@ export interface ToolPolicyConfig {
    */
   deny?: readonly string[];
   /**
-   * Tool name patterns that always trigger human approval, regardless
-   * of `mode: 'default'` vs `'dontAsk'`. In `mode: 'bypass'` these are
-   * still bypassed (because that's what bypass means).
+   * Tool name patterns that always trigger human approval. Wins over
+   * `allow` and every mode, but not `deny`.
    */
   ask?: readonly string[];
   /**
@@ -115,12 +112,12 @@ function formatReason(
  * registry.register('PreToolUse', { hooks: [policyHook] });
  * ```
  *
- * Evaluation order matches Claude Code's permission flow:
+ * Explicit rules take precedence over fallback modes:
  *
  *   1. `deny` rule match → `'deny'` (always wins, even in `bypass`).
- *   2. `mode === 'bypass'` → `'allow'`.
+ *   2. `ask` rule match → `'ask'`.
  *   3. `allow` rule match → `'allow'`.
- *   4. `ask` rule match → `'ask'`.
+ *   4. `mode === 'bypass'` → `'allow'`.
  *   5. `mode === 'dontAsk'` → `'deny'`.
  *   6. fallthrough → `'ask'`.
  *
@@ -168,14 +165,14 @@ function decide(
   if (denyMatch(toolName)) {
     return 'deny';
   }
-  if (mode === 'bypass') {
-    return 'allow';
+  if (askMatch(toolName)) {
+    return 'ask';
   }
   if (allowMatch(toolName)) {
     return 'allow';
   }
-  if (askMatch(toolName)) {
-    return 'ask';
+  if (mode === 'bypass') {
+    return 'allow';
   }
   if (mode === 'dontAsk') {
     return 'deny';

package/src/llm/google/index.ts

@@ -19,6 +19,7 @@ import type { GoogleClientOptions, GoogleThinkingConfig } from '@/types';
 import {
   convertResponseContentToChatGenerationChunk,
   convertBaseMessagesToContent,
+  dropUnsupportedModelTurnPrefill,
   mapGenerateContentResultToChatResult,
 } from './utils/common';
 
@@ -254,6 +255,7 @@ export class CustomChatGoogleGenerativeAI extends ChatGoogleGenerativeAI {
       this.client.systemInstruction = systemInstruction;
       actualPrompt = prompt.slice(1);
     }
+    actualPrompt = dropUnsupportedModelTurnPrefill(actualPrompt, this.model);
     const parameters = this.invocationParams(options);
     const request = {
       ...parameters,
@@ -308,6 +310,7 @@ export class CustomChatGoogleGenerativeAI extends ChatGoogleGenerativeAI {
       this.client.systemInstruction = systemInstruction;
       actualPrompt = prompt.slice(1);
     }
+    actualPrompt = dropUnsupportedModelTurnPrefill(actualPrompt, this.model);
     const parameters = this.invocationParams(options);
     const request = {
       ...parameters,

package/src/llm/google/utils/common.test.ts

@@ -1,12 +1,16 @@
 import { expect, test, describe } from '@jest/globals';
 import { AIMessageChunk } from '@langchain/core/messages';
-import type { EnhancedGenerateContentResponse } from '@google/generative-ai';
+import type { Content, EnhancedGenerateContentResponse } from '@google/generative-ai';
 import {
   STREAMED_TOOL_CALL_SEAL_METADATA_KEY,
   STREAMED_TOOL_CALL_ADAPTER_METADATA_KEY,
   GOOGLE_STREAMED_TOOL_CALL_ADAPTER,
 } from '@/tools/streamedToolCallSeals';
-import { convertResponseContentToChatGenerationChunk } from './common';
+import {
+  convertResponseContentToChatGenerationChunk,
+  dropUnsupportedModelTurnPrefill,
+  rejectsModelTurnPrefill,
+} from './common';
 
 function buildResponse(
   parts: Array<Record<string, unknown>>
@@ -62,3 +66,54 @@ describe('convertResponseContentToChatGenerationChunk seal metadata', () => {
     expect(metadata[STREAMED_TOOL_CALL_SEAL_METADATA_KEY]).toBeUndefined();
   });
 });
+
+describe('rejectsModelTurnPrefill', () => {
+  test('is true for models that reject a trailing model turn', () => {
+    expect(rejectsModelTurnPrefill('gemini-3.6-flash')).toBe(true);
+    expect(rejectsModelTurnPrefill('gemini-3.5-flash-lite')).toBe(true);
+    expect(rejectsModelTurnPrefill('models/gemini-3.6-flash')).toBe(true);
+    expect(rejectsModelTurnPrefill('google/gemini-3.5-flash-lite-latest')).toBe(true);
+  });
+
+  test('is false for models that still accept prefill and for empty input', () => {
+    expect(rejectsModelTurnPrefill('gemini-3.5-flash')).toBe(false);
+    expect(rejectsModelTurnPrefill('gemini-2.5-flash')).toBe(false);
+    expect(rejectsModelTurnPrefill('gemini-3-pro-preview')).toBe(false);
+    expect(rejectsModelTurnPrefill(undefined)).toBe(false);
+    expect(rejectsModelTurnPrefill('')).toBe(false);
+  });
+});
+
+describe('dropUnsupportedModelTurnPrefill', () => {
+  const userTurn: Content = { role: 'user', parts: [{ text: 'Hi' }] };
+  const modelTurn: Content = { role: 'model', parts: [{ text: 'Hello, I am' }] };
+
+  test('drops a trailing model turn for no-prefill models', () => {
+    const contents: Content[] = [userTurn, modelTurn];
+    const result = dropUnsupportedModelTurnPrefill(contents, 'gemini-3.6-flash');
+    expect(result).toEqual([userTurn]);
+  });
+
+  test('drops multiple consecutive trailing model turns but keeps one turn', () => {
+    const contents: Content[] = [userTurn, modelTurn, modelTurn];
+    const result = dropUnsupportedModelTurnPrefill(contents, 'gemini-3.5-flash-lite');
+    expect(result).toEqual([userTurn]);
+  });
+
+  test('leaves a trailing model turn for models that accept prefill', () => {
+    const contents: Content[] = [userTurn, modelTurn];
+    const result = dropUnsupportedModelTurnPrefill(contents, 'gemini-3.5-flash');
+    expect(result).toBe(contents);
+  });
+
+  test('is a no-op when the request already ends with a user turn', () => {
+    const contents: Content[] = [modelTurn, userTurn];
+    const result = dropUnsupportedModelTurnPrefill(contents, 'gemini-3.6-flash');
+    expect(result).toBe(contents);
+  });
+
+  test('is a no-op for empty or undefined contents', () => {
+    expect(dropUnsupportedModelTurnPrefill([], 'gemini-3.6-flash')).toEqual([]);
+    expect(dropUnsupportedModelTurnPrefill(undefined, 'gemini-3.6-flash')).toBeUndefined();
+  });
+});

package/src/llm/google/utils/common.ts

@@ -631,6 +631,50 @@ export function convertBaseMessagesToContent(
   ).content;
 }
 
+/**
+ * Gemini models that reject a request whose `contents` end with a `model`-role
+ * turn (a "prefill"). Google enforces this on newer generations (Gemini 3.6
+ * Flash, Gemini 3.5 Flash-Lite) while older/sibling models still accept a
+ * trailing model turn, so the rule is model-scoped rather than version-wide.
+ * Extend this list as Google applies the restriction to further models.
+ * @see https://ai.google.dev/gemini-api/docs/latest-model#api-changes-and-parameter-updates
+ */
+const NO_PREFILL_GEMINI_MODELS = [
+  'gemini-3.6-flash',
+  'gemini-3.5-flash-lite',
+] as const;
+
+export function rejectsModelTurnPrefill(model?: string): boolean {
+  if (model == null || model === '') {
+    return false;
+  }
+  const modelId = model.toLowerCase().split('/').pop() ?? '';
+  return NO_PREFILL_GEMINI_MODELS.some(
+    (id) => modelId === id || modelId.startsWith(`${id}-`)
+  );
+}
+
+/**
+ * Drops trailing `model`-role turns for models that reject prefill (see
+ * {@link rejectsModelTurnPrefill}). Such a turn is only produced by prefill
+ * flows (e.g. editing an assistant reply and resubmitting); these models return
+ * HTTP 400 for it, so we drop it and let the model generate fresh from the
+ * preceding user turn. No-op for every other model, preserving working prefill.
+ */
+export function dropUnsupportedModelTurnPrefill(
+  contents: Content[] | undefined,
+  model?: string
+): Content[] | undefined {
+  if (contents == null || contents.length === 0 || !rejectsModelTurnPrefill(model)) {
+    return contents;
+  }
+  let end = contents.length;
+  while (end > 1 && contents[end - 1]?.role === 'model') {
+    end -= 1;
+  }
+  return end === contents.length ? contents : contents.slice(0, end);
+}
+
 export function convertResponseContentToChatGenerationChunk(
   response: EnhancedGenerateContentResponse,
   extra: {

package/src/tools/ToolSearch.ts

@@ -359,18 +359,48 @@ function simplifyParametersForSearch(
   return { type: parameters.type };
 }
 
+/**
+ * Splits one alphanumeric identifier segment on case boundaries without
+ * emitting artificial one-character acronym fragments.
+ */
+function splitCaseSegment(segment: string): string[] {
+  const splitTokens = segment
+    .replace(/([a-z0-9])([A-Z])/g, '$1 $2')
+    .replace(/([A-Z]+)([A-Z][a-z])/g, '$1 $2')
+    .toLowerCase()
+    .split(/\s+/)
+    .filter(Boolean);
+
+  if (splitTokens.length < 2) return splitTokens;
+
+  const mergedTokens: string[] = [];
+  let prefix = '';
+  for (const token of splitTokens) {
+    if (token.length === 1) {
+      prefix += token;
+      continue;
+    }
+    mergedTokens.push(`${prefix}${token}`);
+    prefix = '';
+  }
+
+  if (prefix && mergedTokens.length > 0) {
+    mergedTokens[mergedTokens.length - 1] += prefix;
+  }
+  return mergedTokens.length > 0 ? mergedTokens : [prefix];
+}
+
 /**
  * Tokenizes a string into lowercase words for BM25.
- * Splits on underscores and non-alphanumeric characters for consistent matching.
+ * Splits camelCase, underscores, and non-alphanumeric characters for consistent matching.
  * @param text - The text to tokenize
  * @returns Array of lowercase tokens
  */
 function tokenize(text: string): string[] {
   return text
-    .toLowerCase()
-    .replace(/[^a-z0-9]/g, ' ')
-    .split(/\s+/)
-    .filter((token) => token.length > 0);
+    .split(/[^a-zA-Z0-9]+/)
+    .filter(Boolean)
+    .flatMap(splitCaseSegment);
 }
 
 /**
@@ -396,7 +426,7 @@ function createToolDocument(tool: t.ToolMetadata, fields: string[]): string {
     parts.push(paramNames);
   }
 
-  return parts.join(' ');
+  return tokenize(parts.join(' ')).join(' ');
 }
 
 /**
@@ -498,35 +528,63 @@ function performLocalSearch(
 
   const maxScore = Math.max(...scores.filter((s) => s > 0), 1);
   const queryLower = query.toLowerCase().trim();
+  const queryIdentifier = queryTokens.join('');
+  const matchesIdentifiers = fields.includes('name');
 
-  const results: t.ToolSearchResult[] = [];
+  const results: Array<{
+    result: t.ToolSearchResult;
+    identifierPriority: number;
+  }> = [];
   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) {
+    const score = scores[i];
+    const hasSearchScore = Number.isFinite(score) && score > 0;
+    let identifierPriority = 0;
+    let normalizedScore = hasSearchScore ? Math.min(score / maxScore, 1.0) : 0;
+
+    if (matchesIdentifiers) {
+      const rawBaseName = getBaseToolName(tools[i].name).toLowerCase();
+      const rawFullName = tools[i].name.toLowerCase();
+      const baseIdentifier = tokenize(rawBaseName).join('');
+      const fullIdentifier = tokenize(rawFullName).join('');
+
+      if (rawFullName === queryLower) {
+        identifierPriority = 4;
+        normalizedScore = 1.0;
+      } else if (rawBaseName === queryLower) {
+        identifierPriority = 3;
+        normalizedScore = 1.0;
+      } else if (
+        baseIdentifier === queryIdentifier ||
+        fullIdentifier === queryIdentifier
+      ) {
+        identifierPriority = 2;
         normalizedScore = 1.0;
-      } else if (baseName.startsWith(queryLower)) {
+      } else if (baseIdentifier.startsWith(queryIdentifier)) {
+        identifierPriority = 1;
         normalizedScore = Math.max(normalizedScore, 0.95);
       }
+    }
+
+    if (!hasSearchScore && identifierPriority === 0) continue;
 
-      results.push({
+    const { field, snippet } = findMatchedField(tools[i], queryTokens, fields);
+    results.push({
+      result: {
         tool_name: tools[i].name,
         match_score: normalizedScore,
         matched_field: field,
         snippet,
-      });
-    }
+      },
+      identifierPriority,
+    });
   }
 
-  results.sort((a, b) => b.match_score - a.match_score);
-  const topResults = results.slice(0, maxResults);
+  results.sort(
+    (a, b) =>
+      b.identifierPriority - a.identifierPriority ||
+      b.result.match_score - a.result.match_score
+  );
+  const topResults = results.slice(0, maxResults).map(({ result }) => result);
 
   return {
     tool_references: topResults,