fix(proxy): parse a WS frame that may spell web_search_call with JSON escapes

The WebSocket prescreen skipped any frame without the literal
"web_search_call", so a response.create whose item type arrived as
"web_search_call" went upstream with its search history although
json.loads (and the backend) read it as web_search_call. Only a \uXXXX
escape can spell a letter or underscore, so a frame holding any \u is now
parsed as well. Regression tests cover the helper and the WS handler, with
a bypass session still forwarding the frame unchanged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Garm
2026-10-14 14:42:10 +02:00
co-authored by Claude Opus 5.5
parent 418faa61e3
commit fa7cea7db9
2 changed files with 60 additions and 2 deletions
+4 -2
View File
@@ -1155,9 +1155,11 @@ def _drop_undeclared_web_search_calls_from_frame(
Returns *raw_msg* unchanged (same object) unless items were dropped. The
substring prescreen keeps every frame without a ``web_search_call`` from
paying a parse.
paying a parse. JSON can spell the type with ``\\uXXXX`` escapes
(``"web_search\\u005fcall"``), and a letter or underscore can only be
escaped that way, so a frame holding any ``\\u`` is parsed too.
"""
if '"web_search_call"' not in raw_msg:
if '"web_search_call"' not in raw_msg and "\\u" not in raw_msg:
return raw_msg
try:
frame = json.loads(raw_msg)
@@ -174,6 +174,29 @@ def test_frame_helper_returns_the_same_string_unless_it_drops() -> None:
assert _drop_undeclared_web_search_calls_from_frame(raw) is raw
def test_frame_helper_decodes_escaped_type_spellings() -> None:
# json.loads reads "web_search_call" as web_search_call, and so does
# the backend, so the prescreen must not skip it.
escaped = (
'{"type":"response.create","response":{"input":'
'[{"type":"web_search\\u005fcall","id":"ws_1"}],"tools":[]}}'
)
assert json.loads(escaped)["response"]["input"][0]["type"] == "web_search_call"
assert json.loads(_drop_undeclared_web_search_calls_from_frame(escaped))["response"] == {
"input": [],
"tools": [],
}
# Escapes alone change nothing: declared tool, no search history.
for raw in (
'{"type":"response.create","response":{"input":'
'[{"type":"web_search\\u005fcall","id":"ws_1"}],"tools":[{"type":"web_search"}]}}',
'{"type":"response.create","response":{"input":'
'[{"type":"message","role":"user","content":"caf\\u00e9"}],"tools":[]}}',
):
assert _drop_undeclared_web_search_calls_from_frame(raw) is raw
# --- HTTP /v1/responses ----------------------------------------------------
_CODEX_HEADERS = {
@@ -309,6 +332,39 @@ async def test_ws_bypass_session_frames_reach_upstream_unchanged() -> None:
assert upstream.sent == [compaction, compaction]
@pytest.mark.asyncio
@pytest.mark.parametrize("bypass", [False, True], ids=["normal", "bypass"])
async def test_ws_escaped_web_search_call_frame(bypass: bool) -> None:
escaped = (
'{"type":"response.create","response":{"model":"gpt-5-codex","input":'
'[{"type":"web_search\\u005fcall","id":"ws_1"}],"tools":[]}}'
)
headers = {"authorization": "Bearer test"}
if bypass:
headers["x-headroom-bypass"] = "true"
upstream = _FakeUpstream([], hold_after_events=True)
client_ws = _FakeWebSocket(frames=[escaped], headers=headers, hold_after_initial=True)
async def _disconnect_soon() -> None:
await asyncio.sleep(0.05)
client_ws.trigger_disconnect()
with patch.dict(sys.modules, {"websockets": _make_fake_websockets_module(upstream)}):
trigger = asyncio.create_task(_disconnect_soon())
try:
await asyncio.wait_for(
_DummyOpenAIHandler().handle_openai_responses_ws(client_ws), timeout=2.0
)
finally:
trigger.cancel()
assert len(upstream.sent) == 1
if bypass:
assert upstream.sent[0] == escaped
else:
assert json.loads(upstream.sent[0])["response"]["input"] == []
@pytest.mark.asyncio
async def test_ws_later_frame_reaches_upstream_without_web_search_calls() -> None:
normal_turn = _frame(_compaction_body(tools=[{"type": "web_search"}]))