diff --git a/headroom/proxy/handlers/anthropic.py b/headroom/proxy/handlers/anthropic.py
index a6b0f5fb4..74ce5bb7d 100644
--- a/headroom/proxy/handlers/anthropic.py
+++ b/headroom/proxy/handlers/anthropic.py
@@ -3434,7 +3434,10 @@ class AnthropicHandlerMixin:
                     # blocks every other request for the duration; a timeout
                     # here is caught below and passes the item through.
                     result = await self._run_compression_in_executor(
-                        lambda messages=messages, model=model, context_limit=context_limit, frozen_message_count=frozen_message_count: (
+                        lambda messages=messages,
+                        model=model,
+                        context_limit=context_limit,
+                        frozen_message_count=frozen_message_count: (
                             self.anthropic_pipeline.apply(
                                 messages=messages,
                                 model=model,
diff --git a/headroom/proxy/tool_injection_config.py b/headroom/proxy/tool_injection_config.py
index 01ebdf0bf..5cb6a8b76 100644
--- a/headroom/proxy/tool_injection_config.py
+++ b/headroom/proxy/tool_injection_config.py
@@ -3,41 +3,35 @@
 from __future__ import annotations
 
 import os
-from typing import Literal, cast
 
-TOOL_INJECTION_STICKY_ENV = "HEADROOM_TOOL_INJECTION_STICKY"
-ToolInjectionStickyMode = Literal["enabled", "disabled"]
-TOOL_INJECTION_STICKY_DEFAULT: ToolInjectionStickyMode = "enabled"
+from headroom.proxy.tool_injection_policy import (
+    TOOL_INJECTION_STICKY_DEFAULT,
+    TOOL_INJECTION_STICKY_ENV,
+    TOOL_TRACKER_MAX_SESSIONS_DEFAULT,
+    TOOL_TRACKER_MAX_SESSIONS_ENV,
+    ToolInjectionStickyMode,
+    resolve_tool_injection_sticky_mode,
+    resolve_tool_tracker_max_sessions,
+)
 
-TOOL_TRACKER_MAX_SESSIONS_ENV = "HEADROOM_TOOL_TRACKER_MAX_SESSIONS"
-TOOL_TRACKER_MAX_SESSIONS_DEFAULT = 1000
+__all__ = [
+    "TOOL_INJECTION_STICKY_DEFAULT",
+    "TOOL_INJECTION_STICKY_ENV",
+    "TOOL_TRACKER_MAX_SESSIONS_DEFAULT",
+    "TOOL_TRACKER_MAX_SESSIONS_ENV",
+    "ToolInjectionStickyMode",
+    "get_tool_injection_sticky_mode",
+    "get_tool_tracker_max_sessions",
+]
 
 
 def get_tool_injection_sticky_mode() -> ToolInjectionStickyMode:
     """Return the active memory-tool stickiness mode."""
 
-    raw = os.environ.get(TOOL_INJECTION_STICKY_ENV, "").strip().lower()
-    if not raw:
-        return TOOL_INJECTION_STICKY_DEFAULT
-    if raw in ("enabled", "disabled"):
-        return cast(ToolInjectionStickyMode, raw)
-    raise ValueError(
-        f"Invalid {TOOL_INJECTION_STICKY_ENV}={raw!r}; expected 'enabled' or 'disabled'"
-    )
+    return resolve_tool_injection_sticky_mode(os.environ.get(TOOL_INJECTION_STICKY_ENV))
 
 
 def get_tool_tracker_max_sessions() -> int:
     """Return the LRU bound for memory tool session tracking."""
 
-    raw = os.environ.get(TOOL_TRACKER_MAX_SESSIONS_ENV, "").strip()
-    if not raw:
-        return TOOL_TRACKER_MAX_SESSIONS_DEFAULT
-    try:
-        value = int(raw)
-    except ValueError as exc:
-        raise ValueError(
-            f"Invalid {TOOL_TRACKER_MAX_SESSIONS_ENV}={raw!r}; expected positive int"
-        ) from exc
-    if value <= 0:
-        raise ValueError(f"Invalid {TOOL_TRACKER_MAX_SESSIONS_ENV}={raw!r}; expected positive int")
-    return value
+    return resolve_tool_tracker_max_sessions(os.environ.get(TOOL_TRACKER_MAX_SESSIONS_ENV))
diff --git a/headroom/proxy/tool_injection_policy.py b/headroom/proxy/tool_injection_policy.py
new file mode 100644
index 000000000..428fab125
--- /dev/null
+++ b/headroom/proxy/tool_injection_policy.py
@@ -0,0 +1,44 @@
+"""Policy helpers for memory tool injection stickiness configuration."""
+
+from __future__ import annotations
+
+from typing import Literal, cast
+
+TOOL_INJECTION_STICKY_ENV = "HEADROOM_TOOL_INJECTION_STICKY"
+ToolInjectionStickyMode = Literal["enabled", "disabled"]
+TOOL_INJECTION_STICKY_DEFAULT: ToolInjectionStickyMode = "enabled"
+
+TOOL_TRACKER_MAX_SESSIONS_ENV = "HEADROOM_TOOL_TRACKER_MAX_SESSIONS"
+TOOL_TRACKER_MAX_SESSIONS_DEFAULT = 1000
+
+
+def resolve_tool_injection_sticky_mode(raw: str | None) -> ToolInjectionStickyMode:
+    """Resolve memory-tool injection stickiness mode from an environment value."""
+
+    normalized = (raw or "").strip().lower()
+    if not normalized:
+        return TOOL_INJECTION_STICKY_DEFAULT
+    if normalized in ("enabled", "disabled"):
+        return cast(ToolInjectionStickyMode, normalized)
+    raise ValueError(
+        f"Invalid {TOOL_INJECTION_STICKY_ENV}={normalized!r}; expected 'enabled' or 'disabled'"
+    )
+
+
+def resolve_tool_tracker_max_sessions(raw: str | None) -> int:
+    """Resolve the positive LRU session bound for tool injection tracking."""
+
+    normalized = (raw or "").strip()
+    if not normalized:
+        return TOOL_TRACKER_MAX_SESSIONS_DEFAULT
+    try:
+        value = int(normalized)
+    except ValueError as exc:
+        raise ValueError(
+            f"Invalid {TOOL_TRACKER_MAX_SESSIONS_ENV}={normalized!r}; expected positive int"
+        ) from exc
+    if value <= 0:
+        raise ValueError(
+            f"Invalid {TOOL_TRACKER_MAX_SESSIONS_ENV}={normalized!r}; expected positive int"
+        )
+    return value
diff --git a/tests/test_tool_injection_policy.py b/tests/test_tool_injection_policy.py
new file mode 100644
index 000000000..b5962aebe
--- /dev/null
+++ b/tests/test_tool_injection_policy.py
@@ -0,0 +1,42 @@
+from __future__ import annotations
+
+import pytest
+
+from headroom.proxy.tool_injection_policy import (
+    TOOL_INJECTION_STICKY_ENV,
+    TOOL_TRACKER_MAX_SESSIONS_DEFAULT,
+    TOOL_TRACKER_MAX_SESSIONS_ENV,
+    resolve_tool_injection_sticky_mode,
+    resolve_tool_tracker_max_sessions,
+)
+
+
+def test_resolve_tool_injection_sticky_mode_defaults_to_enabled() -> None:
+    assert resolve_tool_injection_sticky_mode(None) == "enabled"
+    assert resolve_tool_injection_sticky_mode("  ") == "enabled"
+
+
+def test_resolve_tool_injection_sticky_mode_accepts_known_values() -> None:
+    assert resolve_tool_injection_sticky_mode("ENABLED") == "enabled"
+    assert resolve_tool_injection_sticky_mode(" disabled ") == "disabled"
+
+
+def test_resolve_tool_injection_sticky_mode_rejects_unknown_values() -> None:
+    with pytest.raises(ValueError, match=TOOL_INJECTION_STICKY_ENV):
+        resolve_tool_injection_sticky_mode("maybe")
+
+
+def test_resolve_tool_tracker_max_sessions_defaults() -> None:
+    assert resolve_tool_tracker_max_sessions(None) == TOOL_TRACKER_MAX_SESSIONS_DEFAULT
+    assert resolve_tool_tracker_max_sessions("  ") == TOOL_TRACKER_MAX_SESSIONS_DEFAULT
+
+
+def test_resolve_tool_tracker_max_sessions_accepts_positive_int() -> None:
+    assert resolve_tool_tracker_max_sessions("42") == 42
+    assert resolve_tool_tracker_max_sessions(" 7 ") == 7
+
+
+@pytest.mark.parametrize("raw", ["0", "-1", "not-int", "1.5"])
+def test_resolve_tool_tracker_max_sessions_rejects_invalid_values(raw: str) -> None:
+    with pytest.raises(ValueError, match=TOOL_TRACKER_MAX_SESSIONS_ENV):
+        resolve_tool_tracker_max_sessions(raw)