Revert "merge: tier2/phase2_4_5_call_site_completion_20260621 (parent + follow-up + Phase 6e analysis)"

This reverts commit f914b2bcd4, reversing
changes made to 7fef95cc87.

tests/test_openai_compatible.py

@@ -5,7 +5,6 @@ from src.openai_compatible import (
  OpenAICompatibleRequest,
  send_openai_compatible,
 )
-from src.openai_schemas import UsageStats
 from src.vendor_capabilities import VendorCapabilities, register
 
 @pytest.fixture
@@ -59,8 +58,8 @@ def test_tool_call_detection_in_blocking_response(caps: VendorCapabilities) -> N
  kwargs = {"model": "m", "messages": [{"role": "user", "content": "ping"}], "temperature": 0.0, "top_p": 1.0, "max_tokens": 8192, "stream": False}
  response = _send_blocking(client, kwargs)
  assert len(response.tool_calls) == 1
- assert response.tool_calls[0].function.name == "read_file"
- assert response.tool_calls[0].id == "call_1"
+ assert response.tool_calls[0]["function"]["name"] == "read_file"
+ assert response.tool_calls[0]["id"] == "call_1"
 
 def test_vision_multimodal_message(caps: VendorCapabilities) -> None:
  client = MagicMock()
@@ -85,6 +84,6 @@ def test_error_classification_429_to_rate_limit(caps: VendorCapabilities) -> Non
 
 def test_normalized_response_is_frozen_dataclass() -> None:
  from dataclasses import FrozenInstanceError
- r = NormalizedResponse(text="x", tool_calls=(), usage=UsageStats(input_tokens=0, output_tokens=0), raw_response=None)
+ r = NormalizedResponse(text="x", tool_calls=[], usage_input_tokens=0, usage_output_tokens=0, usage_cache_read_tokens=0, usage_cache_creation_tokens=0, raw_response=None)
  with pytest.raises(FrozenInstanceError):
   r.text = "y"