Merge branch '1.0-dev' into ishymko/push-notifications

Author: ishymko

src/a2a/server/request_handlers/default_request_handler.py

@@ -137,25 +137,15 @@ async def on_list_tasks(
     ) -> ListTasksResponse:
         """Default handler for 'tasks/list'."""
         page = await self.task_store.list(params, context)
-        processed_tasks = []
         for task in page.tasks:
-            processed_task = task
-
             if not params.include_artifacts:
-                new_task = Task()
-                new_task.CopyFrom(processed_task)
-                new_task.ClearField('artifacts')
-                processed_task = new_task
-
-            if params.history_length > 0:
-                processed_task = apply_history_length(
-                    processed_task, params.history_length
-                )
-            processed_tasks.append(processed_task)
-        return ListTasksResponse(
-            next_page_token=page.next_page_token or '',
-            tasks=processed_tasks,
-        )
+                task.ClearField('artifacts')
+
+            updated_task = apply_history_length(task, params.history_length)
+            if updated_task is not task:
+                task.CopyFrom(updated_task)
+
+        return page
 
     async def on_cancel_task(
         self,

src/a2a/server/request_handlers/grpc_handler.py

@@ -134,7 +134,6 @@ async def SendMessage(
                 request, server_context
             )
             self._set_extension_metadata(context, server_context)
-            # Wrap in SendMessageResponse based on type
             if isinstance(task_or_message, a2a_pb2.Task):
                 return a2a_pb2.SendMessageResponse(task=task_or_message)
             return a2a_pb2.SendMessageResponse(message=task_or_message)

src/a2a/server/request_handlers/jsonrpc_handler.py

@@ -26,7 +26,6 @@
     GetTaskRequest,
     ListTaskPushNotificationConfigRequest,
     ListTasksRequest,
-    Message,
     SendMessageRequest,
     SendMessageResponse,
     SubscribeToTaskRequest,
@@ -171,15 +170,10 @@ async def on_message_send(
             task_or_message = await self.request_handler.on_message_send(
                 request, context
             )
-            # Build result based on return type
-            response = SendMessageResponse()
             if isinstance(task_or_message, Task):
-                response.task.CopyFrom(task_or_message)
-            elif isinstance(task_or_message, Message):
-                response.message.CopyFrom(task_or_message)
+                response = SendMessageResponse(task=task_or_message)
             else:
-                # Should we handle this fallthrough?
-                pass
+                response = SendMessageResponse(message=task_or_message)
 
             result = MessageToDict(response)
             return _build_success_response(request_id, result)

src/a2a/server/request_handlers/rest_handler.py

@@ -84,7 +84,6 @@ async def on_message_send(
         task_or_message = await self.request_handler.on_message_send(
             params, context
         )
-        # Wrap the result in a SendMessageResponse
         if isinstance(task_or_message, a2a_pb2.Task):
             response = a2a_pb2.SendMessageResponse(task=task_or_message)
         else:

src/a2a/server/tasks/database_task_store.py

@@ -261,7 +261,8 @@ async def list(
             return a2a_pb2.ListTasksResponse(
                 tasks=tasks[:page_size],
                 total_size=total_count,
-                next_page_token=next_page_token or '',
+                next_page_token=next_page_token,
+                page_size=page_size,
             )
 
     async def delete(

src/a2a/server/tasks/inmemory_task_store.py

@@ -106,7 +106,8 @@ async def list(
                     break
             if not valid_token:
                 raise ValueError(f'Invalid page token: {params.page_token}')
-        end_idx = start_idx + (params.page_size or DEFAULT_LIST_TASKS_PAGE_SIZE)
+        page_size = params.page_size or DEFAULT_LIST_TASKS_PAGE_SIZE
+        end_idx = start_idx + page_size
         next_page_token = (
             encode_page_token(tasks[end_idx].id)
             if end_idx < total_size
@@ -115,9 +116,10 @@ async def list(
         tasks = tasks[start_idx:end_idx]
 
         return a2a_pb2.ListTasksResponse(
-            next_page_token=next_page_token or '',
+            next_page_token=next_page_token,
             tasks=tasks,
             total_size=total_size,
+            page_size=page_size,
         )
 
     async def delete(

tests/integration/test_client_server_integration.py

@@ -99,6 +99,8 @@
 LIST_TASKS_RESPONSE = ListTasksResponse(
     tasks=[TASK_FROM_BLOCKING, GET_TASK_RESPONSE],
     next_page_token='page-2',
+    total_size=12,
+    page_size=10,
 )
 
 
@@ -489,6 +491,8 @@ async def test_http_transport_list_tasks(
 
     assert len(result.tasks) == 2
     assert result.next_page_token == 'page-2'
+    assert result.total_size == 12
+    assert result.page_size == 10
     handler.on_list_tasks.assert_awaited_once()
 
     if hasattr(transport, 'close'):