mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-08-26 17:12:27 +03:00
⭐5 — Provider x-search de primeira classe (SuperGrok/xAI x_search) em POST /v1/search e MCP omniroute_x_search. Fallback de credenciais xai-oauth→xao→xai; distinto de web search e do X Developer MCP. Reconciliado com o release tip (que já incluía #10981 "skip catalog-default SearXNG" deste mesmo lote): merge trouxe 5 conflitos reais de contagem gerada (llm.txt/README.md/AGENTS.md/PROVIDER_REFERENCE.md/SVGs/46 mirrors i18n, todos verificados como bump puro 347→348, sem perda de conteúdo do HEAD) + 1 conflito real de mergeable=CONFLICTING. Durante a validação, os 3 testes novos de SearXNG expuseram um bug real de interação com #10981: `isUnconfiguredLoopbackSearchProvider()` checava o baseUrl ESTÁTICO do catálogo em vez do baseUrl efetivo (após override de `provider_options.baseUrl` ou `providerSpecificData.baseUrl` da conexão), então QUALQUER request a searxng-search — mesmo com override customizado — era rejeitado como se fosse o default não-configurado. Corrigido em `open-sse/handlers/search.ts` (resolve o baseUrl efetivo via `resolveSearchBaseUrl()` antes do skip-check, tanto para o provider primário quanto o alternate). Um teste do próprio #10988 que assumia o comportamento pré-#10981 (default localhost:8888 sempre atendido) foi atualizado para refletir o comportamento já mesclado e intencional (503 quando não configurado). Validação completa: typecheck limpo, 70/70 testes unit (search-route/search-registry/x-search-provider/searxng-loopback-default), 24/24 vitest MCP, 14/14 integration (search-providers-catalog), lint limpo nos arquivos tocados, docs-counts-sync OK (2 drifts soft pré-existentes, não relacionados), gates estáticos (file-size/complexity/cognitive/dead-code/changelog) todos OK.
84 lines
4.5 KiB
TypeScript
84 lines
4.5 KiB
TypeScript
import test from "node:test";
|
|
import assert from "node:assert/strict";
|
|
|
|
// Regression for #6854: TOTAL_MCP_TOOL_COUNT (open-sse/mcp-server/server.ts) was a
|
|
// plain additive sum across all registered tool collections. Three tools
|
|
// (omniroute_agent_skills_list/get/coverage) are intentionally defined in BOTH
|
|
// MCP_TOOLS (open-sse/mcp-server/schemas/tools.ts) and agentSkillTools
|
|
// (open-sse/mcp-server/tools/agentSkillTools.ts), so the additive sum reported 121
|
|
// while only 109 distinct tool names actually exist. countUniqueMcpTools
|
|
// (open-sse/mcp-server/toolCount.ts) fixes this by unioning tool names from every
|
|
// registered collection into a Set, so each user-visible tool is counted once.
|
|
|
|
const { countUniqueMcpTools } = await import("../../open-sse/mcp-server/toolCount.ts");
|
|
const { MCP_TOOLS } = await import("../../open-sse/mcp-server/schemas/tools.ts");
|
|
const { memoryTools } = await import("../../open-sse/mcp-server/tools/memoryTools.ts");
|
|
const { skillTools } = await import("../../open-sse/mcp-server/tools/skillTools.ts");
|
|
const { agentSkillTools } = await import("../../open-sse/mcp-server/tools/agentSkillTools.ts");
|
|
const { githubSkillTools } = await import("../../open-sse/mcp-server/tools/githubSkillTools.ts");
|
|
const { poolTools } = await import("../../open-sse/mcp-server/tools/poolTools.ts");
|
|
const { gamificationTools } = await import("../../open-sse/mcp-server/tools/gamificationTools.ts");
|
|
const { pluginTools } = await import("../../open-sse/mcp-server/tools/pluginTools.ts");
|
|
const { notionTools } = await import("../../open-sse/mcp-server/tools/notionTools.ts");
|
|
const { obsidianTools } = await import("../../open-sse/mcp-server/tools/obsidianTools.ts");
|
|
const { localCorpusTools } = await import("../../open-sse/mcp-server/tools/localCorpusTools.ts");
|
|
const { compressionTools } = await import("../../open-sse/mcp-server/tools/compressionTools.ts");
|
|
|
|
type NamedTool = { name: string };
|
|
|
|
function namesOf(collection: readonly NamedTool[] | Record<string, NamedTool>): string[] {
|
|
return Array.isArray(collection)
|
|
? collection.map((t) => t.name)
|
|
: Object.values(collection).map((t) => t.name);
|
|
}
|
|
|
|
test("#6854: countUniqueMcpTools de-duplicates tools registered in multiple collections", () => {
|
|
// The agent-skills trio is intentionally present in both MCP_TOOLS and agentSkillTools.
|
|
const mcpToolsNames = namesOf(MCP_TOOLS as unknown as NamedTool[]);
|
|
const agentSkillNames = namesOf(agentSkillTools as unknown as Record<string, NamedTool>);
|
|
const overlap = mcpToolsNames.filter((n) => agentSkillNames.includes(n));
|
|
assert.ok(
|
|
overlap.length > 0,
|
|
"expected MCP_TOOLS and agentSkillTools to still share the agent-skills tool names " +
|
|
"(if this fails because the overlap was removed instead, this test's premise no " +
|
|
"longer applies and it should be revisited)"
|
|
);
|
|
|
|
const collections = {
|
|
MCP_TOOLS: MCP_TOOLS as unknown as NamedTool[],
|
|
memoryTools: memoryTools as unknown as Record<string, NamedTool>,
|
|
skillTools: skillTools as unknown as Record<string, NamedTool>,
|
|
agentSkillTools: agentSkillTools as unknown as Record<string, NamedTool>,
|
|
githubSkillTools: githubSkillTools as unknown as Record<string, NamedTool>,
|
|
poolTools: poolTools as unknown as Record<string, NamedTool>,
|
|
gamificationTools: gamificationTools as unknown as NamedTool[],
|
|
pluginTools: pluginTools as unknown as NamedTool[],
|
|
notionTools: notionTools as unknown as NamedTool[],
|
|
obsidianTools: obsidianTools as unknown as NamedTool[],
|
|
localCorpusTools: localCorpusTools as unknown as NamedTool[],
|
|
compressionTools: compressionTools as unknown as Record<string, NamedTool>,
|
|
};
|
|
|
|
const total = countUniqueMcpTools(collections);
|
|
assert.equal(total, 110, "the published MCP inventory must match the registered tool set");
|
|
|
|
// Independently compute the "true" unique count by unioning every collection's
|
|
// tool names into a Set — this must equal countUniqueMcpTools's own result AND
|
|
// must be strictly less than the naive additive sum whenever there is overlap.
|
|
const uniqueNames = new Set<string>();
|
|
for (const collection of Object.values(collections)) {
|
|
for (const name of namesOf(collection)) uniqueNames.add(name);
|
|
}
|
|
|
|
const naiveAdditiveSum = Object.values(collections).reduce(
|
|
(sum, collection) => sum + namesOf(collection).length,
|
|
0
|
|
);
|
|
|
|
assert.equal(total, uniqueNames.size, "countUniqueMcpTools must equal the unique-name count");
|
|
assert.ok(
|
|
total < naiveAdditiveSum,
|
|
"unique count must be strictly less than the naive additive sum given a known overlap"
|
|
);
|
|
});
|