Skip to content

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.

fix(proxy): reassemble server_tool_use.input from streamed partial_json (#2449)

Parideboy8c8fae0d0bca
diff --git a/headroom/ccr/response_handler.py b/headroom/ccr/response_handler.py
index af9241e82..ff93aa981 100644
--- a/headroom/ccr/response_handler.py
+++ b/headroom/ccr/response_handler.py
@@ -811,9 +811,11 @@ class StreamingCCRHandler:
if dtype == "text_delta":
target["text"] = target.get("text", "") + delta.get("text", "")
elif dtype == "input_json_delta":
- if target.get("type") == "tool_use":
- partial = delta.get("partial_json", "")
- target["_partial_json"] = target.get("_partial_json", "") + partial
+ # Accumulate for any block streaming input (tool_use AND
+ # server_tool_use); the stop handler parses it into `input`
+ # (#2438).
+ partial = delta.get("partial_json", "")
+ target["_partial_json"] = target.get("_partial_json", "") + partial
elif dtype == "thinking_delta":
target["thinking_buffer"] = target.get("thinking_buffer", "") + delta.get(
"thinking", ""
@@ -830,13 +832,17 @@ class StreamingCCRHandler:
idx = event.get("index")
target = (blocks_by_index.get(idx) if idx is not None else None) or current_block
if target is not None:
- if target.get("type") == "tool_use" and "_partial_json" in target:
- partial = target.pop("_partial_json", "")
- if partial:
- try:
- target["input"] = json.loads(partial)
- except json.JSONDecodeError:
- target["input"] = {}
+ # Parse streamed `_partial_json` into `input` for any block
+ # that carried input_json_delta — tool_use AND
+ # server_tool_use — not just tool_use. The narrow type gate
+ # left server_tool_use.input malformed and leaked the scratch
+ # key into replayed history (#2438). Always strip the key.
+ if "_partial_json" in target:
+ partial = target.pop("_partial_json")
+ try:
+ target["input"] = json.loads(partial) if partial else {}
+ except json.JSONDecodeError:
+ target["input"] = {}
if target.get("type") == "thinking" and "thinking_buffer" in target:
target["thinking"] = target.pop("thinking_buffer")
if target not in response["content"]:
diff --git a/headroom/proxy/handlers/streaming.py b/headroom/proxy/handlers/streaming.py
index da4bdb521..b3fc68547 100644
--- a/headroom/proxy/handlers/streaming.py
+++ b/headroom/proxy/handlers/streaming.py
@@ -494,13 +494,20 @@ class StreamingMixin:
idx = data.get("index")
target = (blocks_by_index.get(idx) if idx is not None else None) or current_block
if target is not None:
- # Parse accumulated JSON for tool_use blocks.
- if target.get("type") == "tool_use" and "_partial_json" in target:
+ # Parse accumulated JSON into `input` for any block that
+ # streamed `input_json_delta` — tool_use AND server_tool_use
+ # (and future tool-ish blocks). Gating on the block type
+ # missed server_tool_use, leaving its `input` at the empty
+ # start-event value and leaking the `_partial_json` scratch
+ # key into replayed assistant history, which Anthropic then
+ # rejects with `server_tool_use.input: Input should be an
+ # object` (#2438). Always strip the scratch key.
+ if "_partial_json" in target:
+ raw = target.pop("_partial_json")
try:
- target["input"] = json.loads(target["_partial_json"])
+ target["input"] = json.loads(raw) if raw else {}
except json.JSONDecodeError:
target["input"] = {}
- del target["_partial_json"]
# Materialize the thinking buffer into the
# canonical `thinking` field expected by the
# Anthropic API.
diff --git a/tests/test_ccr_response_handler_extra.py b/tests/test_ccr_response_handler_extra.py
index c85e4dd94..20883ee19 100644
--- a/tests/test_ccr_response_handler_extra.py
+++ b/tests/test_ccr_response_handler_extra.py
@@ -425,3 +425,36 @@ async def test_response_to_sse_preserves_anthropic_shape() -> None:
assert parsed["content"][1]["data"] == "ENC:abc"
assert parsed["stop_reason"] == "refusal"
assert parsed["stop_details"] == stop_details
+
+
+def test_reconstruct_server_tool_use_input_from_partial_json() -> None:
+ # StreamingCCRHandler._reconstruct_anthropic_response must parse streamed
+ # input_json_delta into `input` for server_tool_use, not only tool_use.
+ # The narrow type gate left server_tool_use.input malformed and leaked the
+ # `_partial_json` scratch key into replayed assistant history → Anthropic
+ # 400 `server_tool_use.input: Input should be an object` (#2438).
+ handler = StreamingCCRHandler(CCRResponseHandler(), provider="anthropic")
+ events = [
+ {"type": "message_start", "message": {"id": "msg_1", "model": "claude-opus-4"}},
+ {
+ "type": "content_block_start",
+ "index": 0,
+ "content_block": {
+ "type": "server_tool_use",
+ "id": "srvtoolu_1",
+ "name": "web_search",
+ "input": {},
+ },
+ },
+ {
+ "type": "content_block_delta",
+ "index": 0,
+ "delta": {"type": "input_json_delta", "partial_json": '{"query": "x"}'},
+ },
+ {"type": "content_block_stop", "index": 0},
+ ]
+ response = handler._reconstruct_anthropic_response(events)
+ block = response["content"][0]
+ assert block["type"] == "server_tool_use"
+ assert block["input"] == {"query": "x"}
+ assert "_partial_json" not in block
diff --git a/tests/test_sse_thinking_blocks.py b/tests/test_sse_thinking_blocks.py
index 376bbe1dc..0b32881f8 100644
--- a/tests/test_sse_thinking_blocks.py
+++ b/tests/test_sse_thinking_blocks.py
@@ -499,3 +499,45 @@ def test_buffered_ccr_extended_thinking_round_trip_preserves_all_blocks() -> Non
)
assert round_tripped["content"][2]["type"] == "tool_use"
assert round_tripped["content"][2]["input"] == {"y": 2}
+
+
+def test_server_tool_use_input_reassembled_from_partial_json() -> None:
+ # server_tool_use streams its input via input_json_delta exactly like
+ # tool_use: the content_block_start carries an empty input, the real args
+ # arrive as partial_json, and content_block_stop must parse them into an
+ # object. Gating the parse on type == "tool_use" left server_tool_use.input
+ # empty and leaked the `_partial_json` scratch key into replayed assistant
+ # history, which Anthropic rejects on the next turn (#2438).
+ parser = _Parser()
+ events = [
+ {"type": "message_start", "message": {"id": "msg_1", "model": "claude-opus-4"}},
+ {
+ "type": "content_block_start",
+ "index": 0,
+ "content_block": {
+ "type": "server_tool_use",
+ "id": "srvtoolu_1",
+ "name": "web_search",
+ "input": {},
+ },
+ },
+ {
+ "type": "content_block_delta",
+ "index": 0,
+ "delta": {"type": "input_json_delta", "partial_json": '{"query": "hea'},
+ },
+ {
+ "type": "content_block_delta",
+ "index": 0,
+ "delta": {"type": "input_json_delta", "partial_json": 'droom proxy"}'},
+ },
+ {"type": "content_block_stop", "index": 0},
+ ]
+ sse = _build_sse(events)
+ response = parser._parse_sse_to_response(sse, "anthropic")
+ assert response is not None
+ block = response["content"][0]
+ assert block["type"] == "server_tool_use"
+ assert block["input"] == {"query": "headroom proxy"}
+ # Scratch key must never leak into a block that gets replayed as history.
+ assert "_partial_json" not in block