From 5fb27cbbf96a627b815ae5020e55b22152538995 Mon Sep 17 00:00:00 2001
From: jaeminbird <jaeminbird@gmail.com>
Date: Thu, 29 Oct 2026 05:45:56 -0400
Subject: [PATCH] fix(compat): return HTTP errors from v0.3 REST streams that
 fail early

The v0.3 REST adapter started the SSE response before running the
handler, so a malformed message:stream body or an unknown task on
tasks/{id}:subscribe produced an empty 200 text/event-stream. Fetch the
first event before starting the stream, as the v1.0 REST dispatcher
does, so these errors get the same JSON error response as message:send.
---
 src/a2a/compat/v0_3/rest_adapter.py          | 16 ++++-
 tests/compat/v0_3/test_rest_routes_compat.py | 63 ++++++++++++++++++++
 2 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/src/a2a/compat/v0_3/rest_adapter.py b/src/a2a/compat/v0_3/rest_adapter.py
index 0c2449dfa..9b91f3bd2 100644
--- a/src/a2a/compat/v0_3/rest_adapter.py
+++ b/src/a2a/compat/v0_3/rest_adapter.py
@@ -93,14 +93,28 @@ async def _handle_streaming_request(
 
         call_context = self._context_builder.build(request)
 
+        # Fetch the first item before starting the SSE response so that
+        # errors raised before any event (e.g. a malformed body) are mapped
+        # to an HTTP error by @rest_stream_error_handler instead of an empty
+        # 200 stream, matching the v1.0 REST dispatcher.
+        stream = aiter(method(request, call_context))
+        try:
+            first_item = await anext(stream)
+        except StopAsyncIteration:
+            return create_event_source_response(
+                iter([]),
+                shutdown_grace_period=self._shutdown_grace_period,
+            )
+
         async def event_generator(
             stream: AsyncIterable[Any],
         ) -> AsyncIterator[str]:
+            yield json_utils.dumps(first_item)
             async for item in stream:
                 yield json_utils.dumps(item)
 
         return create_event_source_response(
-            event_generator(method(request, call_context)),
+            event_generator(stream),
             shutdown_grace_period=self._shutdown_grace_period,
         )
 
diff --git a/tests/compat/v0_3/test_rest_routes_compat.py b/tests/compat/v0_3/test_rest_routes_compat.py
index 8ce54ef09..5e5871044 100644
--- a/tests/compat/v0_3/test_rest_routes_compat.py
+++ b/tests/compat/v0_3/test_rest_routes_compat.py
@@ -1,3 +1,4 @@
+import json
 import logging
 
 from collections.abc import AsyncIterator
@@ -19,6 +20,7 @@
     TaskState as TaskState10,
     TaskStatus as TaskStatus10,
 )
+from a2a.utils.errors import TaskNotFoundError
 from fastapi import FastAPI
 from google.protobuf import json_format
 from httpx import ASGITransport, AsyncClient
@@ -282,3 +284,64 @@ async def stream_with_non_ascii(
         payload = payload.decode('utf-8')
     assert non_ascii_text in payload
     assert '\\u4f60\\u597d' not in payload
+
+
+@pytest.mark.anyio
+async def test_v03_message_stream_malformed_json_returns_400(
+    client: AsyncClient, request_handler: MagicMock
+) -> None:
+    response = await client.post(
+        '/v1/message:stream',
+        content=b'{bad',
+        headers={'Content-Type': 'application/json'},
+    )
+
+    assert response.status_code == 400
+    assert response.headers['content-type'].startswith('application/json')
+    assert response.json()['error']['status'] == 'INVALID_ARGUMENT'
+    request_handler.on_message_send_stream.assert_not_called()
+
+
+@pytest.mark.anyio
+async def test_v03_subscribe_unknown_task_returns_404(
+    client: AsyncClient, request_handler: MagicMock
+) -> None:
+    async def not_found(*args: object, **kwargs: object) -> AsyncIterator[None]:
+        raise TaskNotFoundError
+        yield
+
+    request_handler.on_subscribe_to_task.side_effect = not_found
+
+    response = await client.post('/v1/tasks/unknown:subscribe')
+
+    assert response.status_code == 404
+    assert response.json()['error']['status'] == 'NOT_FOUND'
+
+
+@pytest.mark.anyio
+async def test_v03_streaming_yields_all_events_in_order(
+    request_handler: RequestHandler,
+) -> None:
+    adapter = REST03Adapter(http_handler=request_handler)
+
+    async def stream(
+        request: Request, context: object
+    ) -> AsyncIterator[dict[str, int]]:
+        for i in range(3):
+            yield {'n': i}
+
+    mock_req = MagicMock(spec=Request)
+    mock_req.body = AsyncMock(return_value=b'{}')
+    mock_req.headers = Headers({'a2a-version': '0.3'})
+    mock_req.user = MagicMock(is_authenticated=False)
+    mock_req.auth = None
+    mock_req.scope = {}
+
+    response = await adapter._handle_streaming_request(stream, mock_req)
+    chunks = [chunk async for chunk in response.body_iterator]
+
+    assert [json.loads(chunk) for chunk in chunks] == [
+        {'n': 0},
+        {'n': 1},
+        {'n': 2},
+    ]