fix(proxy): keep memory tools registered in HEADROOM_MEMORY_INJECTION_MODE=tool

Tool mode means no auto-injected context while the agent calls the memory
tools itself. MemoryDecision treated it as a full skip, so every handler
also dropped the memory tool definitions. Leave the decision open for tool
mode and skip the context lookup in search_and_format_context instead.

Refs #4391

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
HetCreep
2026-10-22 19:31:00 +07:00
co-authored by Claude Opus 5.5
parent 62ec86b5b2
commit 9744d2a1b8
7 changed files with 38 additions and 24 deletions
+3 -2
View File
@@ -250,8 +250,9 @@ def capture_codex_wire_debug(
# prefix) is never mutated.
# - "disabled": Memory context lookup is skipped entirely; the request
# forwards untouched.
# - "tool": Auto-injection is off; the agent calls memory tools explicitly
# (skip reason ``mode_tool`` in memory_decision.py).
# - "tool": Auto-injection of context is off, but the memory tools are still
# registered; the agent calls them explicitly (``search_and_format_context``
# returns None in this mode).
#
# Configurable via HEADROOM_MEMORY_INJECTION_MODE env var. There is no
# "system_prompt" option — that path is permanently retired by I2 (cache hot
+1 -4
View File
@@ -20,9 +20,7 @@ Precedence (highest first):
2. ``no_handler`` — no memory backend configured
3. ``no_user_id`` — per-request user_id missing
4. ``mode_disabled`` — operator HEADROOM_MEMORY_INJECTION_MODE=disabled
5. ``mode_tool`` — operator HEADROOM_MEMORY_INJECTION_MODE=tool
(auto-inject off; the agent calls memory tools explicitly)
6. otherwise → ``inject=True``
5. otherwise → ``inject=True``
This module exposes one value type + one factory + one helper. Pure
function; same Rust-port shape as :class:`CompressionDecision`.
@@ -59,7 +57,6 @@ class MemoryDecision:
# * "no_handler" — no memory backend configured on the proxy
# * "no_user_id" — per-request user_id missing
# * "mode_disabled" — operator HEADROOM_MEMORY_INJECTION_MODE=disabled
# * "mode_tool" — operator HEADROOM_MEMORY_INJECTION_MODE=tool
# When ``inject`` is True, this is None.
skip_reason: str | None
-3
View File
@@ -42,9 +42,6 @@ def decide_memory_injection(
elif mode_name == "disabled":
reason = "mode_disabled"
inject = False
elif mode_name == "tool":
reason = "mode_tool"
inject = False
else:
reason = None
inject = True
+5 -2
View File
@@ -759,9 +759,12 @@ class MemoryHandler:
if not self.config.inject_context:
return None
from headroom.proxy.helpers import get_memory_injection_mode
# PR-B6: Tool mode disables auto-injection. The model calls
# ``memory_search`` to retrieve when it wants to.
if self.config.mode == MemoryMode.TOOL:
# ``memory_search`` to retrieve when it wants to. Selected by the
# handler config or by HEADROOM_MEMORY_INJECTION_MODE=tool.
if self.config.mode == MemoryMode.TOOL or get_memory_injection_mode() == "tool":
logger.info(
"event=memory_mode_skip mode=tool user_id=%s reason=tool_mode_no_auto_injection",
user_id,
+7 -12
View File
@@ -143,14 +143,15 @@ def test_mode_disabled_is_skip() -> None:
assert d.skip_reason == "mode_disabled"
def test_mode_tool_is_skip() -> None:
"""TOOL mode: auto-injection disabled (the agent calls memory
tools explicitly instead). Distinct from disabled."""
def test_mode_tool_keeps_tools_registered() -> None:
"""TOOL mode: context auto-injection is off (see
MemoryHandler.search_and_format_context) but the decision stays open
so the memory tools are still registered for the agent."""
d = MemoryDecision.decide(
headers={}, memory_handler=_memory_handler(), memory_user_id="u1", mode_name="tool"
)
assert d.inject is False
assert d.skip_reason == "mode_tool"
assert d.inject is True
assert d.skip_reason is None
# ── Precedence ordering when multiple gates close ────────────────────
@@ -197,7 +198,7 @@ def test_mode_disabled_beats_mode_tool() -> None:
headers={}, memory_handler=_memory_handler(), memory_user_id="u1", mode_name="tool"
)
assert d_dis.skip_reason == "mode_disabled"
assert d_tool.skip_reason == "mode_tool"
assert d_tool.skip_reason is None
# ── Observability fields ─────────────────────────────────────────────
@@ -300,12 +301,6 @@ def test_apply_to_tags_for_every_skip_reason() -> None:
"memory_user_id": "u1",
"mode_name": "disabled",
},
"mode_tool": {
"headers": {},
"memory_handler": _memory_handler(),
"memory_user_id": "u1",
"mode_name": "tool",
},
}
for expected, kwargs in cases.items():
d = MemoryDecision.decide(**kwargs)
+2 -1
View File
@@ -50,7 +50,8 @@ def test_decide_memory_injection_reports_mode_reasons() -> None:
)
assert disabled.skip_reason == "mode_disabled"
assert tool.skip_reason == "mode_tool"
assert tool.inject is True
assert tool.skip_reason is None
def test_apply_memory_skip_reason_stamps_only_when_skipping() -> None:
@@ -31,3 +31,23 @@ def test_get_memory_injection_mode_accepts_tool_from_env(monkeypatch: pytest.Mon
def test_resolve_memory_injection_mode_rejects_unknown_values() -> None:
with pytest.raises(ValueError, match="HEADROOM_MEMORY_INJECTION_MODE"):
resolve_memory_injection_mode("system_prompt")
async def test_tool_mode_skips_context_search_but_keeps_decision_open(
monkeypatch: pytest.MonkeyPatch,
) -> None:
"""tool mode: no auto-injected context, memory tools stay registrable."""
from headroom.proxy.memory_decision import MemoryDecision
from headroom.proxy.memory_handler import MemoryConfig, MemoryHandler
monkeypatch.setenv("HEADROOM_MEMORY_INJECTION_MODE", "tool")
handler = MemoryHandler(MemoryConfig(enabled=True, backend="local"))
messages = [{"role": "user", "content": "what did I say about databases?"}]
assert await handler.search_and_format_context("u1", messages) is None
assert handler._initialized is False # returned before any backend lookup
decision = MemoryDecision.decide(
headers={}, memory_handler=handler, memory_user_id="u1", mode_name="tool"
)
assert decision.inject is True