Compress tool outputs, logs, files, and RAG chunks before they reach the LLM. 20% fewer tokens for coding agents, 60-95% fewer tokens for JSON, same answers. Library, proxy, MCP server.
Python agentaianthropicclaude-codecompressioncontext-engineeringcontext-windowcursorfastapilangchainllmmcpopenaiprompt-engineeringproxypythonragtoken-optimizationtokenstypescript
fix(router): honor MCP aliases in excluded tools (#1822) (#1863)
Vinay Gupta140d6e4f9609
diff --git a/headroom/config.py b/headroom/config.pyindex 73cddf794..2a61e0abe 100644--- a/headroom/config.py+++ b/headroom/config.py@@ -229,6 +229,27 @@ DEFAULT_EXCLUDE_TOOLS: frozenset[str] = frozenset()+def _tool_name_aliases(name: str) -> tuple[str, ...]:+ """Return equivalent spellings for tool exclusion matching."""+ aliases = [name]+ lname = name.lower()++ if lname.startswith("mcp__"):+ # OpenAI-style MCP wrappers use mcp__server__tool. Custom agents that+ # speak Anthropic sometimes emit the same wrapper as mcp_Server_tool.+ parts = name.split("__", 2)+ if len(parts) == 3 and parts[1] and parts[2]:+ aliases.append(f"mcp_{parts[1]}_{parts[2]}")+ aliases.append(parts[2])+ elif lname.startswith("mcp_"):+ parts = name.split("_", 2)+ if len(parts) == 3 and parts[1] and parts[2]:+ aliases.append(f"mcp__{parts[1]}__{parts[2]}")+ aliases.append(parts[2])++ return tuple(dict.fromkeys(aliases))++def is_tool_excluded(name: str, exclude_tools: Iterable[str]) -> bool:"""Return True if ``name`` matches the tool-exclusion set.@@ -237,15 +258,28 @@ def is_tool_excluded(name: str, exclude_tools: Iterable[str]) -> bool:``[``) are matched with :func:`fnmatch.fnmatchcase`, letting a single patternsuch as ``mcp__*`` cover every tool an MCP server exposes without listingeach name (issue #870).++ MCP tool wrappers are also matched through their common aliases. For example,+ ``mcp__Headroom__headroom_retrieve`` and+ ``mcp_Headroom_headroom_retrieve`` both match ``mcp__*`` and the bare+ ``headroom_retrieve`` entry."""if not exclude_tools:return False- if name in exclude_tools or name.lower() in exclude_tools:++ patterns = tuple(exclude_tools)+ if not patterns:+ return False+ aliases = _tool_name_aliases(name)+ exact_patterns = set(patterns)+ lower_exact_patterns = {pat.lower() for pat in exact_patterns}+ if any(alias in exact_patterns or alias.lower() in lower_exact_patterns for alias in aliases):return True- lname = name.lower()+return any(- fnmatch.fnmatchcase(lname, pat.lower())- for pat in exclude_tools+ fnmatch.fnmatchcase(alias.lower(), pat.lower())+ for alias in aliases+ for pat in patternsif "*" in pat or "?" in pat or "[" in pat)diff --git a/tests/test_transforms/test_content_router.py b/tests/test_transforms/test_content_router.pyindex 16c3e7f39..62fc9a75d 100644--- a/tests/test_transforms/test_content_router.py+++ b/tests/test_transforms/test_content_router.py@@ -796,16 +796,100 @@ class TestExcludeTools:assert json.loads(result.messages[1]["content"]) == json.loads(messages[1]["content"])assert "router:excluded:lossless_json" in result.transforms_applied+ def test_anthropic_mcp_alias_exclude_tools(self, tokenizer):+ """Single-underscore MCP names from custom agents honor documented MCP globs."""+ config = ContentRouterConfig(+ min_section_tokens=10,+ exclude_tools={"mcp__*"},+ )+ router = ContentRouter(config)++ messages = [+ {+ "role": "assistant",+ "content": [+ {+ "type": "tool_use",+ "id": "toolu_mcp_1",+ "name": "mcp_CursorTaskRegistry_cursor_list_tasks",+ "input": {"project": "headroom"},+ }+ ],+ },+ {+ "role": "user",+ "content": [+ {+ "type": "tool_result",+ "tool_use_id": "toolu_mcp_1",+ "content": generate_json_data(50),+ }+ ],+ },+ ]++ result = router.apply(messages, tokenizer)++ tool_result_block = result.messages[1]["content"][0]+ assert json.loads(tool_result_block["content"]) == json.loads(+ messages[1]["content"][0]["content"]+ )+ assert "router:excluded:lossless_json" in result.transforms_applied++ def test_anthropic_mcp_bare_tool_alias_exclude_tools(self, tokenizer):+ """Bare tool exclusions match custom-agent MCP wrappers (#1822)."""+ config = ContentRouterConfig(+ min_section_tokens=10,+ exclude_tools={"headroom_retrieve"},+ )+ router = ContentRouter(config)++ messages = [+ {+ "role": "assistant",+ "content": [+ {+ "type": "tool_use",+ "id": "toolu_retrieve_1",+ "name": "mcp_HeadroomZai_headroom_retrieve",+ "input": {"key": "abc123"},+ }+ ],+ },+ {+ "role": "user",+ "content": [+ {+ "type": "tool_result",+ "tool_use_id": "toolu_retrieve_1",+ "content": generate_json_data(50),+ }+ ],+ },+ ]++ result = router.apply(messages, tokenizer)++ tool_result_block = result.messages[1]["content"][0]+ assert json.loads(tool_result_block["content"]) == json.loads(+ messages[1]["content"][0]["content"]+ )+ assert "router:excluded:lossless_json" in result.transforms_applied+def test_is_tool_excluded_helper(self):"""is_tool_excluded: exact (case-insensitive) and glob matching."""from headroom.config import is_tool_excluded# Glob entry covers a whole MCP server; unrelated tools are untouched.assert is_tool_excluded("mcp__build123d__measure", {"mcp__*"})+ assert is_tool_excluded("mcp_CursorTaskRegistry_cursor_list_tasks", {"mcp__*"})assert not is_tool_excluded("Bash", {"mcp__*"})# Plain entries keep exact, case-insensitive membership.assert is_tool_excluded("Read", {"read"})assert is_tool_excluded("MCP__X", {"mcp__*"})+ # MCP wrapper aliases can still be excluded by their bare tool name.+ assert is_tool_excluded("mcp_HeadroomZai_headroom_retrieve", {"headroom_retrieve"})+ assert is_tool_excluded("mcp__Headroom__headroom_retrieve", {"headroom_retrieve"})# Empty set never excludes.assert not is_tool_excluded("Read", set())