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(ccr): only proactively expand compressions present in the requesting conversation (#3924)
Parideboy9b9a883e96ec
diff --git a/headroom/ccr/context_tracker.py b/headroom/ccr/context_tracker.pyindex 885966407..786eaaf15 100644--- a/headroom/ccr/context_tracker.py+++ b/headroom/ccr/context_tracker.py@@ -23,6 +23,7 @@ from __future__ import annotationsimport loggingimport reimport time+from collections.abc import Collectionfrom dataclasses import dataclassfrom typing import Any@@ -232,6 +233,7 @@ class ContextTracker:current_turn: int | None = None,*,workspace_key: str,+ present_hashes: Collection[str] | None = None,) -> list[ExpansionRecommendation]:"""Analyze a query to find relevant compressed contexts.@@ -246,6 +248,13 @@ class ContextTracker:a workspace before invoking; the empty string short-circuits to an empty result set rather than matchingempty-keyed test contexts to avoid accidental crossover.+ present_hashes: CCR hashes whose markers appear in the request+ being answered. When given, only those contexts may expand.+ One workspace can serve several live conversations at once+ (a Claude Code lead and its teammates share a cwd), and a+ compression the requesting conversation never received is+ another conversation's tool output, not context it lost+ (#1174). ``None`` skips this filter.Returns:List of expansion recommendations, sorted by relevance.@@ -278,6 +287,8 @@ class ContextTracker:# the current request resolved to.if context.workspace_key != workspace_key:continue+ if present_hashes is not None and hash_key not in present_hashes:+ continue# Check ageage = now - context.timestampdiff --git a/headroom/proxy/handlers/anthropic.py b/headroom/proxy/handlers/anthropic.pyindex 6e507c032..d49d7d151 100644--- a/headroom/proxy/handlers/anthropic.py+++ b/headroom/proxy/handlers/anthropic.py@@ -2534,6 +2534,7 @@ class AnthropicHandlerMixin:# ``ccr_inject_system_instructions=False``, or when ``_bypass`` is# set. The downstream uses already treat falsy as "unresolved".ccr_workspace_key, ccr_workspace_label = None, None+ ccr_present_hashes: list[str] = []if (self.config.ccr_inject_tool or self.config.ccr_inject_system_instructions) and not _bypass:@@ -2556,7 +2557,7 @@ class AnthropicHandlerMixin:# Shape-only scanning also matches markers from other context# tools; drop hashes this proxy never actually stored before# they can drive tool injection (issue #2836).- injector.verify_ownership()+ ccr_present_hashes = injector.verify_ownership()if inject_system_instructions and injector.has_compressed_content:optimized_messages = injector.inject_into_system_message(optimized_messages)@@ -2690,6 +2691,10 @@ class AnthropicHandlerMixin:user_query,self._turn_counter,workspace_key=ccr_workspace_key,+ # Only this conversation's own compressions: a+ # same-cwd teammate must not receive the lead's+ # tool output (#1174).+ present_hashes=ccr_present_hashes,)if recommendations:expansions = self.ccr_context_tracker.execute_expansions(recommendations)diff --git a/tests/test_ccr_context_tracker.py b/tests/test_ccr_context_tracker.pyindex fe45b3d69..1e0050217 100644--- a/tests/test_ccr_context_tracker.py+++ b/tests/test_ccr_context_tracker.py@@ -958,3 +958,91 @@ class TestWorkspaceScoping:# read, not purging on write — workspace A could come back and use# them again within the age window).assert len(tracker.get_tracked_hashes()) == 5+++# ============================================================================+# Conversation scoping (#1174).+#+# One workspace (cwd) can carry several live conversations at once: a Claude+# Code lead and its agent-team teammates all run in the same directory. The+# workspace gate alone let the lead's compressed tool output keyword-match a+# teammate's incoming message and get appended to it. `present_hashes` limits+# expansion to compressions whose markers the requesting conversation holds.+# ============================================================================+++class TestConversationScoping:+ """Same-workspace conversations must not receive each other's content."""++ _QUERY = "please review the auth middleware session code"++ @pytest.fixture(autouse=True)+ def reset_trackers(self):+ reset_context_tracker()+ reset_compression_store()+ yield+ reset_context_tracker()+ reset_compression_store()++ @staticmethod+ def _track(tracker: ContextTracker, hash_key: str, sample: str) -> None:+ tracker.track_compression(+ hash_key=hash_key,+ turn_number=1,+ tool_name="Bash",+ original_count=100,+ compressed_count=10,+ workspace_key="ws-team",+ query_context="list the auth code",+ sample_content=sample,+ )++ def test_hash_absent_from_request_is_not_expanded(self):+ tracker = ContextTracker(ContextTrackerConfig(relevance_threshold=0.1))+ self._track(tracker, "lead_hash", "auth middleware login session token")++ recommendations = tracker.analyze_query(+ query=self._QUERY, current_turn=2, workspace_key="ws-team", present_hashes=[]+ )++ assert recommendations == []++ def test_hash_present_in_request_still_expands(self):+ tracker = ContextTracker(ContextTrackerConfig(relevance_threshold=0.1))+ self._track(tracker, "own_hash", "auth middleware login session token")++ recommendations = tracker.analyze_query(+ query=self._QUERY,+ current_turn=2,+ workspace_key="ws-team",+ present_hashes=["own_hash"],+ )++ assert [r.hash_key for r in recommendations] == ["own_hash"]++ def test_foreign_hash_does_not_take_an_expansion_slot(self):+ config = ContextTrackerConfig(relevance_threshold=0.1, max_proactive_expansions=1)+ tracker = ContextTracker(config)+ # The foreign context is the stronger match; with a single slot it+ # would win if it were scored at all.+ self._track(tracker, "lead_hash", "auth middleware login session token review code")+ self._track(tracker, "own_hash", "auth notes")++ recommendations = tracker.analyze_query(+ query=self._QUERY,+ current_turn=2,+ workspace_key="ws-team",+ present_hashes=["own_hash"],+ )++ assert [r.hash_key for r in recommendations] == ["own_hash"]++ def test_none_keeps_workspace_only_behaviour(self):+ tracker = ContextTracker(ContextTrackerConfig(relevance_threshold=0.1))+ self._track(tracker, "any_hash", "auth middleware login session token")++ recommendations = tracker.analyze_query(+ query=self._QUERY, current_turn=2, workspace_key="ws-team"+ )++ assert [r.hash_key for r in recommendations] == ["any_hash"]diff --git a/tests/test_ccr_expansion_conversation_scope.py b/tests/test_ccr_expansion_conversation_scope.pynew file mode 100644index 000000000..a2bf830ff--- /dev/null+++ b/tests/test_ccr_expansion_conversation_scope.py@@ -0,0 +1,168 @@+"""Regression for #1174: proactive expansion must stay inside one conversation.++A Claude Code lead and its agent-team teammates run in the same directory, so+they resolve the same CCR workspace and share the proxy's process-global+``ContextTracker``. When a teammate's incoming message shared a few keywords+with tool output the lead had compressed, the proxy appended the lead's full+original output to the teammate's message. The teammate had never run that+tool and reported the block as garbage context.++These tests drive the real ``/v1/messages`` handler in token mode (where the+append is live) and inspect the body forwarded upstream.+"""++from __future__ import annotations++from types import SimpleNamespace++import httpx+import pytest++pytest.importorskip("fastapi")++from fastapi.testclient import TestClient++from headroom.cache.compression_store import get_compression_store, reset_compression_store+from headroom.proxy.server import ProxyConfig, create_app++_EXPANSION_TAG = "<headroom_proactive_expansion>"+_LEAD_OUTPUT = "\n".join(+ f"src/auth/middleware_{i}.py session token login handler" for i in range(40)+)+_LEAD_COMPRESSED = "\n".join(_LEAD_OUTPUT.splitlines()[:4])+_LEAD_QUERY = "list the auth middleware files"+_TEAMMATE_QUERY = (+ '<teammate-message teammate_id="team-lead">Review the auth middleware '+ "session handling and report back.</teammate-message>"+)++[email protected](autouse=True)+def _fresh_store():+ reset_compression_store()+ yield+ reset_compression_store()+++def _client() -> TestClient:+ config = ProxyConfig(+ optimize=False,+ mode="token",+ cache_enabled=False,+ rate_limit_enabled=False,+ cost_tracking_enabled=False,+ log_requests=False,+ ccr_handle_responses=False,+ ccr_context_tracking=True,+ ccr_proactive_expansion=True,+ image_optimize=False,+ )+ return TestClient(create_app(config))+++def _track_lead_compression(proxy, cwd: str) -> str: # noqa: ANN001+ """Record a compression the way the handler does after the lead's turn."""+ hash_key = get_compression_store().store(+ _LEAD_OUTPUT,+ _LEAD_COMPRESSED,+ original_item_count=40,+ compressed_item_count=4,+ tool_name="Bash",+ query_context=_LEAD_QUERY,+ )+ workspace_key, _ = proxy._resolve_ccr_workspace(+ SimpleNamespace(headers={"x-headroom-cwd": cwd}), {}+ )+ assert workspace_key+ proxy.ccr_context_tracker.track_compression(+ hash_key=hash_key,+ turn_number=1,+ tool_name="Bash",+ original_count=40,+ compressed_count=4,+ workspace_key=workspace_key,+ query_context=_LEAD_QUERY,+ sample_content=_LEAD_COMPRESSED,+ )+ return hash_key+++def _forwarded_last_user_text(client: TestClient, cwd: str, messages: list[dict]) -> str:+ proxy = client.app.state.proxy+ captured: dict = {}++ async def _fake_retry(method, url, headers, body, stream=False, **kwargs): # noqa: ANN001+ captured["body"] = body+ return httpx.Response(+ 200,+ json={+ "id": "msg_scope",+ "type": "message",+ "role": "assistant",+ "content": [{"type": "text", "text": "ok"}],+ "usage": {"input_tokens": 1, "output_tokens": 1},+ },+ )++ proxy._retry_request = _fake_retry+ response = client.post(+ "/v1/messages",+ headers={+ "x-api-key": "test-key",+ "anthropic-version": "2023-06-01",+ "x-headroom-cwd": cwd,+ },+ json={"model": "claude-sonnet-4-6", "max_tokens": 16, "messages": messages},+ )+ assert response.status_code == 200, response.text+ content = captured["body"]["messages"][-1]["content"]+ return content if isinstance(content, str) else content[0]["text"]+++def test_teammate_does_not_receive_lead_tool_output(tmp_path) -> None: # noqa: ANN001+ cwd = str(tmp_path)+ with _client() as client:+ _track_lead_compression(client.app.state.proxy, cwd)++ forwarded = _forwarded_last_user_text(+ client, cwd, [{"role": "user", "content": _TEAMMATE_QUERY}]+ )++ assert _EXPANSION_TAG not in forwarded+ assert forwarded == _TEAMMATE_QUERY+++def test_conversation_holding_the_marker_still_expands(tmp_path) -> None: # noqa: ANN001+ cwd = str(tmp_path)+ with _client() as client:+ hash_key = _track_lead_compression(client.app.state.proxy, cwd)++ forwarded = _forwarded_last_user_text(+ client,+ cwd,+ [+ {"role": "user", "content": _LEAD_QUERY},+ {+ "role": "assistant",+ "content": [+ {"type": "tool_use", "id": "t1", "name": "Bash", "input": {"command": "ls"}}+ ],+ },+ {+ "role": "user",+ "content": [+ {+ "type": "tool_result",+ "tool_use_id": "t1",+ "content": f"[40 items compressed to 4. Retrieve more: hash={hash_key}]",+ }+ ],+ },+ {"role": "assistant", "content": "Listed them."},+ {"role": "user", "content": _TEAMMATE_QUERY},+ ],+ )++ assert _EXPANSION_TAG in forwarded+ # Line 39 is only in the original, never in the compressed preview.+ assert "src/auth/middleware_39.py" in forwarded