mirror of
https://github.com/headroomlabs-ai/headroom.git
synced 2026-08-27 14:17:10 -04:00
## Description `_TOOL_SEARCH_CORE_TOOLS` is spelled in lowercase, but the membership test compared the raw tool name, so the core-tool exemption never fired for clients that send PascalCase names. For Claude Code (`Bash`, `Read`, `Edit`, `ToolSearch`) **every** tool in the request body was deferred. The damaging part is that Claude Code's own `ToolSearch` was deferred. It is the schema fetcher for tools the client keeps in its local registry and never sends in the body — `TaskCreate`, `TaskUpdate`, `TaskList`, `WebFetch`, `EnterPlanMode`, `Monitor`, `LSP`, `Cron*`, `SendMessage`. Hiding it makes all of them permanently uncallable: advertised to the model in a `<system-reminder>`, but no search can return their schemas, because the injected `tool_search_tool_regex` only indexes what is in the request body. Closes #2646 ## Type of Change - [x] Bug fix (non-breaking change that fixes an issue) - [ ] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] Documentation update - [ ] Performance improvement - [ ] Code refactoring (no functional changes) ## Changes Made - Compare tool names against the core set case-insensitively in `inject_tool_search_deferral` (`helpers.py`). - Add `"toolsearch"` to `_TOOL_SEARCH_CORE_TOOLS` so a client's own schema-fetch tool is never deferred. - Apply the same case-insensitive comparison to `inject_tool_search_deferral_openai`, which had the identical exact-match bug (including against `_OPENAI_TOOL_SEARCH_RESIDENT_NAMES = {"terminal"}`). - Add 3 tests on the Anthropic path and 1 on the OpenAI path. Both source changes are required: case-folding alone does not help `ToolSearch` (it was not in the set), and adding it alone does not help `Bash`/`Read`/`Edit`. **The token saving is unchanged** — MCP tools are still deferred. This is not a request to disable the feature. Beyond the stranded tools, the old behaviour also meant (a) routine `Bash`/`Read`/`Edit` loops each paid a search round-trip, the exact cost the core set exists to avoid, and (b) zero resident *real* tools remained, silently violating the invariant documented on `inject_tool_search_deferral` — the injected search tool is typed and does not satisfy it — which risks an upstream 400. The existing assertion for that invariant passes today only because its fixture uses lowercase names. ## Testing - [x] Unit tests pass (`pytest`) — the two affected files; see scope note below - [ ] Linting passes (`ruff check .`) — see note - [ ] Type checking passes (`mypy headroom`) — could not run, see note - [x] New tests added for new functionality - [x] Manual testing performed `ruff check .` reports 4 findings repo-wide, **all pre-existing and unrelated** (`plugins/headroom-oauth2/`), confirmed identical on unmodified `main`. Zero findings in the three files this PR touches, and `ruff format --check` is clean on all three. Left unchecked because the repo-wide command does not exit 0. `mypy headroom` could not run in my environment (numpy stubs error out under the resolved Python version before checking begins). Not attempted further — CI should be the authority. ### Test Output ```text $ python -m pytest tests/test_issue_746_tool_search.py tests/test_openai_tool_search_deferral.py -q 65 passed, 1 warning in 0.70s # Baseline on those two files before this PR: 62 (36 + 26). # The 3 new Anthropic tests + 1 new OpenAI test bring it to 65. # Red before the source change (tests written first): tests/test_issue_746_tool_search.py::test_core_tools_match_case_insensitively FAILED AssertionError: Bash assert True is None where {'name': 'Bash', ..., 'defer_loading': True}.get('defer_loading') tests/test_issue_746_tool_search.py::test_client_tool_search_tool_is_never_deferred FAILED AssertionError: assert True is None where {'name': 'ToolSearch', ..., 'defer_loading': True}.get('defer_loading') tests/test_issue_746_tool_search.py::test_resident_real_tool_survives_pascal_case_surface FAILED assert any(not t.get("type") and not t.get("defer_loading") for t in out) assert False 3 failed, 36 deselected $ python -m ruff check headroom/proxy/helpers.py tests/test_issue_746_tool_search.py tests/test_openai_tool_search_deferral.py All checks passed! $ python -m ruff format --check <same three files> 3 files already formatted ``` ## Real Behavior Proof - Environment: headroom 0.32.1 installed / 0.32.0 source, Python 3.13, macOS 15 (Darwin 25.5.0), Claude Code 2.1.220 with `ENABLE_TOOL_SEARCH=true` and `ANTHROPIC_BASE_URL=http://localhost:8787`, first-party Anthropic upstream, `HEADROOM_TOOL_SEARCH` truthy - Exact command / steps: build a Claude Code tool surface and pass it through the injector — `names = ["Bash","Read","Write","Edit","Glob","Grep","ToolSearch"] + [f"mcp__srv__t{i}" for i in range(12)]`, `tools = [{"name": n, "description": n, "input_schema": {}} for n in names]`, then `inject_tool_search_deferral(tools)` and print which entries carry `defer_loading` - Observed result: before the fix `resident real tools: []` with `ToolSearch deferred: True` (every built-in deferred). After the fix `resident real tools: ['Bash','Edit','Glob','Grep','Read','ToolSearch','Write']` with all 12 `mcp__srv__t*` still deferred, so the saving is retained. This matches a live session: the proxy logged `router:tool_search_deferral:25tools:22182tok ... client=claude-code` and `tool_search_tool_regex` could resolve only `mcp__*` tools — `TaskCreate`/`WebFetch`/`EnterPlanMode` returned no match until `ToolSearch` was recovered by regex-searching for it and then calling `select:TaskCreate,...` - Not tested: the full pytest suite (164 modules fail collection with `ModuleNotFoundError: No module named 'headroom._core'` because my environment imports the package via `PYTHONPATH` without building the Rust extension; identical failure confirmed on unmodified `main`, so it is environmental). `mypy headroom` not runnable here. No end-to-end run against a live upstream through a rebuilt proxy — verification is at the function boundary plus the live-session log evidence above. The OpenAI Responses path is covered by unit test only, not exercised against a real gpt-5.4+ deployment. ## Review Readiness - [x] I have performed a self-review - [x] This PR is ready for human review ## Checklist - [x] My code follows the project's style guidelines - [x] I have performed a self-review of my code - [x] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [x] I did **not** edit `CHANGELOG.md` — it is generated by release-please from my Conventional Commit PR title (a CI guard enforces this) ## Additional Notes - **Documentation**: N/A — no user-facing surface changes; behaviour returns to what the existing comments and docstring already describe. - **"New and existing unit tests pass locally"**: left unchecked deliberately. The tests covering the changed symbols pass (65), but I cannot run the whole suite locally without the compiled `headroom._core`. Not claiming more than I verified. - **Scope**: the OpenAI-path fix rides along because it is the identical three-line comparison bug in the sibling function. Happy to split it into its own PR if you would rather keep this Anthropic-only. - **Deliberately not done**: I did not add a `client != "claude-code"` gate at `handlers/anthropic.py`, even though the feature's own comment block scopes it to non-Claude-Code clients and `client=claude-code` is already known there (it appears in the `transforms=` log line). Gating there would forfeit the ~22k tokens/request currently saved on Claude Code's eagerly-shipped MCP schemas; keeping the meta-tool resident preserves both the saving and reachability. Flagging in case you would prefer to gate as well. - **Adjacent blind spot, out of scope**: `claude_code_tool_search_inactive` already checks both the tools array *and* the `anthropic-beta` header, but the injector's early-return guard checks only the array. That is why a plain-function `ToolSearch` slips past it and the injection runs on a client that is already deferring. Co-authored-by: Fabien Culpo <fabien.culpo@dawex.com>
301 lines
11 KiB
Python
301 lines
11 KiB
Python
"""Issue #746: keep Claude Code's on-demand tool loading active through the proxy.
|
|
|
|
Covers the two halves of the fix:
|
|
|
|
* ``headroom wrap claude`` injects ``ENABLE_TOOL_SEARCH`` into the launched
|
|
Claude Code environment (with correct precedence / validation), and
|
|
* the proxy detects a Claude Code request that is *not* deferring tools and
|
|
emits a single actionable hint for users who run ``claude`` manually.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
from headroom.cli.wrap import (
|
|
_TOOL_SEARCH_DEFAULT,
|
|
_TOOL_SEARCH_ENV,
|
|
_configure_tool_search_env,
|
|
_normalize_tool_search_mode,
|
|
)
|
|
from headroom.proxy.helpers import (
|
|
claude_code_tool_search_inactive,
|
|
format_tool_search_disabled_hint,
|
|
reset_tool_search_hint_state,
|
|
take_tool_search_hint_slot,
|
|
tool_search_hint_pending,
|
|
)
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# wrap: ENABLE_TOOL_SEARCH value normalization
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"value,expected",
|
|
[
|
|
("true", "true"),
|
|
("TRUE", "true"),
|
|
(" on ", "on"),
|
|
("1", "1"),
|
|
("false", "false"),
|
|
("off", "off"),
|
|
("auto", "auto"),
|
|
("auto:0", "auto:0"),
|
|
("auto:50", "auto:50"),
|
|
("auto:100", "auto:100"),
|
|
],
|
|
)
|
|
def test_normalize_tool_search_mode_accepts_valid(value: str, expected: str) -> None:
|
|
assert _normalize_tool_search_mode(value) == expected
|
|
|
|
|
|
@pytest.mark.parametrize("value", ["yep", "auto:", "auto:101", "auto:-1", "auto:abc", ""])
|
|
def test_normalize_tool_search_mode_rejects_invalid(value: str) -> None:
|
|
import click
|
|
|
|
with pytest.raises(click.ClickException):
|
|
_normalize_tool_search_mode(value)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# wrap: ENABLE_TOOL_SEARCH injection precedence
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_configure_injects_default_when_unset() -> None:
|
|
env: dict[str, str] = {}
|
|
result = _configure_tool_search_env(env, None)
|
|
assert result == _TOOL_SEARCH_DEFAULT
|
|
assert env[_TOOL_SEARCH_ENV] == _TOOL_SEARCH_DEFAULT
|
|
|
|
|
|
def test_configure_respects_existing_env_value() -> None:
|
|
env = {_TOOL_SEARCH_ENV: "auto:30"}
|
|
result = _configure_tool_search_env(env, None)
|
|
# None signals "left the user's value untouched".
|
|
assert result is None
|
|
assert env[_TOOL_SEARCH_ENV] == "auto:30"
|
|
|
|
|
|
def test_configure_flag_overrides_existing_env_value() -> None:
|
|
env = {_TOOL_SEARCH_ENV: "false"}
|
|
result = _configure_tool_search_env(env, "auto")
|
|
assert result == "auto"
|
|
assert env[_TOOL_SEARCH_ENV] == "auto"
|
|
|
|
|
|
@pytest.mark.parametrize("blank", ["", " ", "\t"])
|
|
def test_configure_overrides_blank_env_value(blank: str) -> None:
|
|
# Claude Code treats an empty ENABLE_TOOL_SEARCH as unset, so a blank value
|
|
# must be replaced with the default rather than forwarded as a no-op.
|
|
env = {_TOOL_SEARCH_ENV: blank}
|
|
result = _configure_tool_search_env(env, None)
|
|
assert result == _TOOL_SEARCH_DEFAULT
|
|
assert env[_TOOL_SEARCH_ENV] == _TOOL_SEARCH_DEFAULT
|
|
|
|
|
|
def test_configure_flag_validated() -> None:
|
|
import click
|
|
|
|
with pytest.raises(click.ClickException):
|
|
_configure_tool_search_env({}, "nonsense")
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# proxy: detect a Claude Code request that is not deferring tools
|
|
# ---------------------------------------------------------------------------
|
|
|
|
_TOOLS = [
|
|
{"name": "Read", "description": "read a file", "input_schema": {"type": "object"}},
|
|
{"name": "Bash", "description": "run a command", "input_schema": {"type": "object"}},
|
|
]
|
|
|
|
|
|
def test_inactive_true_for_eager_claude_code() -> None:
|
|
assert claude_code_tool_search_inactive(client="claude-code", tools=_TOOLS, anthropic_beta=None)
|
|
|
|
|
|
def test_inactive_false_when_tool_search_tool_present() -> None:
|
|
tools = [*_TOOLS, {"type": "tool_search_tool_regex_20251119", "name": "tool_search_tool_regex"}]
|
|
assert not claude_code_tool_search_inactive(
|
|
client="claude-code", tools=tools, anthropic_beta=None
|
|
)
|
|
|
|
|
|
def test_inactive_false_when_beta_header_present() -> None:
|
|
assert not claude_code_tool_search_inactive(
|
|
client="claude-code",
|
|
tools=_TOOLS,
|
|
anthropic_beta="context-1m-2025-08-07,advanced-tool-use-2025-11-20",
|
|
)
|
|
|
|
|
|
def test_inactive_false_for_other_clients() -> None:
|
|
assert not claude_code_tool_search_inactive(client="codex", tools=_TOOLS, anthropic_beta=None)
|
|
assert not claude_code_tool_search_inactive(client=None, tools=_TOOLS, anthropic_beta=None)
|
|
|
|
|
|
def test_inactive_false_when_no_tools() -> None:
|
|
assert not claude_code_tool_search_inactive(client="claude-code", tools=[], anthropic_beta=None)
|
|
assert not claude_code_tool_search_inactive(
|
|
client="claude-code", tools=None, anthropic_beta=None
|
|
)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# proxy: hint content + one-time guard
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def test_hint_message_is_actionable() -> None:
|
|
msg = format_tool_search_disabled_hint(_TOOLS)
|
|
assert "ENABLE_TOOL_SEARCH=true" in msg
|
|
assert "746" in msg
|
|
assert str(len(_TOOLS)) in msg
|
|
|
|
|
|
def test_hint_slot_fires_once() -> None:
|
|
reset_tool_search_hint_state()
|
|
try:
|
|
assert tool_search_hint_pending() is True
|
|
assert take_tool_search_hint_slot() is True
|
|
# Once consumed, the cheap gate flips so the hot path stops scanning.
|
|
assert tool_search_hint_pending() is False
|
|
assert take_tool_search_hint_slot() is False
|
|
assert take_tool_search_hint_slot() is False
|
|
finally:
|
|
reset_tool_search_hint_state()
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Server-side Tool Search injection for plain-API clients (opencode)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
from headroom.proxy.helpers import ( # noqa: E402
|
|
_TOOL_SEARCH_DEFAULT_NAME,
|
|
_TOOL_SEARCH_DEFAULT_TYPE,
|
|
_TOOL_SEARCH_MIN_TOOLS,
|
|
inject_tool_search_deferral,
|
|
)
|
|
|
|
|
|
def _tools(n: int, *, core_first: int = 0) -> list[dict]:
|
|
core = ["bash", "read", "write", "edit", "grep"]
|
|
out: list[dict] = []
|
|
for i in range(n):
|
|
name = core[i] if i < core_first and i < len(core) else f"mcp_tool_{i}"
|
|
out.append({"name": name, "description": f"tool {i}", "input_schema": {}})
|
|
return out
|
|
|
|
|
|
def test_inject_defers_non_core_and_injects_search_tool() -> None:
|
|
tools = _tools(20, core_first=3) # bash/read/write resident, rest deferred
|
|
out = inject_tool_search_deferral(tools)
|
|
assert out is not tools
|
|
# search tool injected, non-deferred, correct shape
|
|
search = out[0]
|
|
assert search == {"type": _TOOL_SEARCH_DEFAULT_TYPE, "name": _TOOL_SEARCH_DEFAULT_NAME}
|
|
assert "defer_loading" not in search
|
|
# core tools stay resident; non-core deferred
|
|
by_name = {t.get("name"): t for t in out if "name" in t}
|
|
assert by_name["bash"].get("defer_loading") is None
|
|
assert by_name["mcp_tool_5"].get("defer_loading") is True
|
|
# at least one non-deferred real tool remains (Anthropic 400s otherwise)
|
|
assert any(not t.get("type") and not t.get("defer_loading") for t in out)
|
|
|
|
|
|
def test_noop_below_min_tools() -> None:
|
|
tools = _tools(_TOOL_SEARCH_MIN_TOOLS - 1)
|
|
assert inject_tool_search_deferral(tools) is tools
|
|
|
|
|
|
def test_noop_when_client_already_uses_tool_search() -> None:
|
|
tools = _tools(20) + [{"type": "tool_search_tool_regex_20251119", "name": "x"}]
|
|
assert inject_tool_search_deferral(tools) is tools
|
|
|
|
|
|
def test_noop_when_nothing_to_defer() -> None:
|
|
# every tool is core -> nothing deferred -> cache prefix untouched
|
|
core = [
|
|
"bash",
|
|
"read",
|
|
"write",
|
|
"edit",
|
|
"multiedit",
|
|
"glob",
|
|
"grep",
|
|
"task",
|
|
"todowrite",
|
|
"todoread",
|
|
"webfetch",
|
|
"skill",
|
|
]
|
|
tools = [{"name": n, "input_schema": {}} for n in core]
|
|
assert inject_tool_search_deferral(tools) is tools
|
|
|
|
|
|
def test_cache_control_moved_off_deferred_tool_to_last_resident() -> None:
|
|
tools = _tools(20, core_first=3)
|
|
# the client's tools cache breakpoint sits on a tool we will defer
|
|
tools[10]["cache_control"] = {"type": "ephemeral"}
|
|
out = inject_tool_search_deferral(tools)
|
|
# no deferred tool may carry cache_control (Anthropic 400s)
|
|
assert all("cache_control" not in t for t in out if t.get("defer_loading"))
|
|
# exactly one resident real tool now carries the moved breakpoint
|
|
resident_cc = [
|
|
t
|
|
for t in out
|
|
if not t.get("type") and not t.get("defer_loading") and t.get("cache_control")
|
|
]
|
|
assert len(resident_cc) == 1
|
|
|
|
|
|
def test_non_dict_and_typed_tools_stay_resident() -> None:
|
|
tools = _tools(15, core_first=2)
|
|
tools.append({"type": "web_search_20250305", "name": "web_search"})
|
|
out = inject_tool_search_deferral(tools)
|
|
typed = [t for t in out if t.get("type") == "web_search_20250305"]
|
|
assert len(typed) == 1 and typed[0].get("defer_loading") is None
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# PascalCase clients (Claude Code). The core-tool exemption is spelled in
|
|
# lowercase, so an exact-match comparison never fired for Claude Code: every
|
|
# tool was deferred, including Claude Code's own ``ToolSearch``.
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
def _claude_code_tools() -> list[dict]:
|
|
"""Claude Code's surface: PascalCase built-ins, its ToolSearch, MCP tools."""
|
|
names = ["Bash", "Read", "Write", "Edit", "Glob", "Grep", "ToolSearch"] + [
|
|
f"mcp__srv__t{i}" for i in range(12)
|
|
]
|
|
return [{"name": n, "description": n, "input_schema": {}} for n in names]
|
|
|
|
|
|
def test_core_tools_match_case_insensitively() -> None:
|
|
# Without a case-insensitive match, routine edit/read/run loops each pay a
|
|
# search round-trip — the exact thing _TOOL_SEARCH_CORE_TOOLS exists to avoid.
|
|
out = inject_tool_search_deferral(_claude_code_tools())
|
|
by_name = {t.get("name"): t for t in out if "name" in t}
|
|
for name in ("Bash", "Read", "Write", "Edit", "Glob", "Grep"):
|
|
assert by_name[name].get("defer_loading") is None, name
|
|
# MCP tools are still deferred — the token saving is preserved.
|
|
assert by_name["mcp__srv__t0"].get("defer_loading") is True
|
|
|
|
|
|
def test_client_tool_search_tool_is_never_deferred() -> None:
|
|
# ToolSearch is the client's own schema fetcher for tools that never appear
|
|
# in the request body (TaskCreate, WebFetch, …). Deferring it hides the only
|
|
# tool that can load them, so they become permanently unreachable.
|
|
out = inject_tool_search_deferral(_claude_code_tools())
|
|
by_name = {t.get("name"): t for t in out if "name" in t}
|
|
assert by_name["ToolSearch"].get("defer_loading") is None
|
|
|
|
|
|
def test_resident_real_tool_survives_pascal_case_surface() -> None:
|
|
# The injected search tool is typed and does not satisfy the invariant on its
|
|
# own; Anthropic 400s when every real tool is deferred.
|
|
out = inject_tool_search_deferral(_claude_code_tools())
|
|
assert any(not t.get("type") and not t.get("defer_loading") for t in out)
|