Address PR review feedback: rename methods, update types, clean up aliases

- Rename on_resubscribe_to_task to on_subscribe_to_task across all handlers
- Update METHOD_TO_MODEL with gRPC-style method names (SendMessage, GetTask, etc.)
- Update JSON-RPC client to use new method names
- Fix ListTaskPushNotificationConfigResponse to use 'configs' field
- Remove TaskResubscriptionRequest alias from extras.py
- Update TransportProtocol imports to use a2a.utils.constants
- Fix on_get_task_push_notification_config params type
- Update all tests for new method names and response types

Author: muscariello

src/a2a/client/transports/jsonrpc.py

@@ -102,7 +102,7 @@ async def send_message(
     ) -> SendMessageResponse:
         """Sends a non-streaming message request to the agent."""
         rpc_request = JSONRPC20Request(
-            method='message/send',
+            method='SendMessage',
             params=json_format.MessageToDict(request),
             _id=str(uuid4()),
         )
@@ -111,7 +111,7 @@ async def send_message(
             extensions if extensions is not None else self.extensions,
         )
         payload, modified_kwargs = await self._apply_interceptors(
-            'message/send',
+            'SendMessage',
             cast('dict[str, Any]', rpc_request.data),
             modified_kwargs,
             context,
@@ -134,7 +134,7 @@ async def send_message_streaming(
     ) -> AsyncGenerator[StreamResponse]:
         """Sends a streaming message request to the agent and yields responses as they arrive."""
         rpc_request = JSONRPC20Request(
-            method='message/stream',
+            method='SendStreamingMessage',
             params=json_format.MessageToDict(request),
             _id=str(uuid4()),
         )
@@ -143,7 +143,7 @@ async def send_message_streaming(
             extensions if extensions is not None else self.extensions,
         )
         payload, modified_kwargs = await self._apply_interceptors(
-            'message/stream',
+            'SendStreamingMessage',
             cast('dict[str, Any]', rpc_request.data),
             modified_kwargs,
             context,
@@ -213,7 +213,7 @@ async def get_task(
     ) -> Task:
         """Retrieves the current state and history of a specific task."""
         rpc_request = JSONRPC20Request(
-            method='tasks/get',
+            method='GetTask',
             params=json_format.MessageToDict(request),
             _id=str(uuid4()),
         )
@@ -222,7 +222,7 @@ async def get_task(
             extensions if extensions is not None else self.extensions,
         )
         payload, modified_kwargs = await self._apply_interceptors(
-            'tasks/get',
+            'GetTask',
             cast('dict[str, Any]', rpc_request.data),
             modified_kwargs,
             context,
@@ -243,7 +243,7 @@ async def cancel_task(
     ) -> Task:
         """Requests the agent to cancel a specific task."""
         rpc_request = JSONRPC20Request(
-            method='tasks/cancel',
+            method='CancelTask',
             params=json_format.MessageToDict(request),
             _id=str(uuid4()),
         )
@@ -252,7 +252,7 @@ async def cancel_task(
             extensions if extensions is not None else self.extensions,
         )
         payload, modified_kwargs = await self._apply_interceptors(
-            'tasks/cancel',
+            'CancelTask',
             cast('dict[str, Any]', rpc_request.data),
             modified_kwargs,
             context,
@@ -273,7 +273,7 @@ async def set_task_callback(
     ) -> TaskPushNotificationConfig:
         """Sets or updates the push notification configuration for a specific task."""
         rpc_request = JSONRPC20Request(
-            method='tasks/pushNotificationConfig/set',
+            method='SetTaskPushNotificationConfig',
             params=json_format.MessageToDict(request),
             _id=str(uuid4()),
         )
@@ -282,7 +282,7 @@ async def set_task_callback(
             extensions if extensions is not None else self.extensions,
         )
         payload, modified_kwargs = await self._apply_interceptors(
-            'tasks/pushNotificationConfig/set',
+            'SetTaskPushNotificationConfig',
             cast('dict[str, Any]', rpc_request.data),
             modified_kwargs,
             context,
@@ -305,7 +305,7 @@ async def get_task_callback(
     ) -> TaskPushNotificationConfig:
         """Retrieves the push notification configuration for a specific task."""
         rpc_request = JSONRPC20Request(
-            method='tasks/pushNotificationConfig/get',
+            method='GetTaskPushNotificationConfig',
             params=json_format.MessageToDict(request),
             _id=str(uuid4()),
         )
@@ -314,7 +314,7 @@ async def get_task_callback(
             extensions if extensions is not None else self.extensions,
         )
         payload, modified_kwargs = await self._apply_interceptors(
-            'tasks/pushNotificationConfig/get',
+            'GetTaskPushNotificationConfig',
             cast('dict[str, Any]', rpc_request.data),
             modified_kwargs,
             context,
@@ -337,7 +337,7 @@ async def subscribe(
     ) -> AsyncGenerator[StreamResponse]:
         """Reconnects to get task updates."""
         rpc_request = JSONRPC20Request(
-            method='tasks/resubscribe',
+            method='SubscribeToTask',
             params=json_format.MessageToDict(request),
             _id=str(uuid4()),
         )
@@ -346,7 +346,7 @@ async def subscribe(
             extensions if extensions is not None else self.extensions,
         )
         payload, modified_kwargs = await self._apply_interceptors(
-            'tasks/resubscribe',
+            'SubscribeToTask',
             cast('dict[str, Any]', rpc_request.data),
             modified_kwargs,
             context,

src/a2a/server/apps/jsonrpc/jsonrpc_app.py

@@ -31,6 +31,7 @@
     ListTaskPushNotificationConfigRequest,
     SendMessageRequest,
     SetTaskPushNotificationConfigRequest,
+    SubscribeToTaskRequest,
 )
 from a2a.types.extras import (
     A2AError,
@@ -40,7 +41,6 @@
     InvalidRequestError,
     JSONParseError,
     MethodNotFoundError,
-    TaskResubscriptionRequest,
     UnsupportedOperationError,
 )
 from a2a.utils.constants import (
@@ -154,17 +154,18 @@ class JSONRPCApplication(ABC):
 
     # Method-to-model mapping for centralized routing
     # Proto types don't have model_fields, so we define the mapping explicitly
+    # Method names match gRPC service method names
     METHOD_TO_MODEL: dict[str, type] = {
-        'message/send': SendMessageRequest,
-        'message/stream': SendMessageRequest,  # Same proto type as message/send
-        'tasks/get': GetTaskRequest,
-        'tasks/cancel': CancelTaskRequest,
-        'tasks/pushNotificationConfig/set': SetTaskPushNotificationConfigRequest,
-        'tasks/pushNotificationConfig/get': GetTaskPushNotificationConfigRequest,
-        'tasks/pushNotificationConfig/list': ListTaskPushNotificationConfigRequest,
-        'tasks/pushNotificationConfig/delete': DeleteTaskPushNotificationConfigRequest,
-        'tasks/resubscribe': TaskResubscriptionRequest,
-        'agent/authenticatedExtendedCard': GetExtendedAgentCardRequest,
+        'SendMessage': SendMessageRequest,
+        'SendStreamingMessage': SendMessageRequest,  # Same proto type as SendMessage
+        'GetTask': GetTaskRequest,
+        'CancelTask': CancelTaskRequest,
+        'SetTaskPushNotificationConfig': SetTaskPushNotificationConfigRequest,
+        'GetTaskPushNotificationConfig': GetTaskPushNotificationConfigRequest,
+        'ListTaskPushNotificationConfig': ListTaskPushNotificationConfigRequest,
+        'DeleteTaskPushNotificationConfig': DeleteTaskPushNotificationConfigRequest,
+        'SubscribeToTask': SubscribeToTaskRequest,
+        'GetExtendedAgentCard': GetExtendedAgentCardRequest,
     }
 
     def __init__(  # noqa: PLR0913
@@ -358,8 +359,7 @@ async def _handle_requests(self, request: Request) -> Response:  # noqa: PLR0911
             call_context.state['request_id'] = request_id
 
             # Route streaming requests by method name
-            # (message/send and message/stream both use SendMessageRequest)
-            if method in ('message/stream', 'tasks/resubscribe'):
+            if method in ('SendStreamingMessage', 'SubscribeToTask'):
                 return await self._process_streaming_request(
                     request_id, specific_request, call_context
                 )
@@ -396,7 +396,7 @@ async def _process_streaming_request(
         request_obj: A2ARequest,
         context: ServerCallContext,
     ) -> Response:
-        """Processes streaming requests (message/stream or tasks/resubscribe).
+        """Processes streaming requests (SendStreamingMessage or SubscribeToTask).
 
         Args:
             request_id: The ID of the request.
@@ -407,16 +407,16 @@ async def _process_streaming_request(
             An `EventSourceResponse` object to stream results to the client.
         """
         handler_result: Any = None
-        # Check for streaming message request (same type as send, but handled differently)
+        # Check for streaming message request (same type as SendMessage, but handled differently)
         if isinstance(
             request_obj,
             SendMessageRequest,
         ):
             handler_result = self.handler.on_message_send_stream(
                 request_obj, context
             )
-        elif isinstance(request_obj, TaskResubscriptionRequest):
-            handler_result = self.handler.on_resubscribe_to_task(
+        elif isinstance(request_obj, SubscribeToTaskRequest):
+            handler_result = self.handler.on_subscribe_to_task(
                 request_obj, context
             )
 

src/a2a/server/apps/rest/rest_adapter.py

@@ -215,7 +215,7 @@ def routes(self) -> dict[tuple[str, str], Callable[[Request], Any]]:
             ),
             ('/v1/tasks/{id}:subscribe', 'GET'): functools.partial(
                 self._handle_streaming_request,
-                self.handler.on_resubscribe_to_task,
+                self.handler.on_subscribe_to_task,
             ),
             ('/v1/tasks/{id}', 'GET'): functools.partial(
                 self._handle_request, self.handler.on_get_task

src/a2a/server/request_handlers/default_request_handler.py

@@ -33,6 +33,7 @@
     GetTaskPushNotificationConfigRequest,
     GetTaskRequest,
     ListTaskPushNotificationConfigRequest,
+    ListTaskPushNotificationConfigResponse,
     Message,
     SendMessageRequest,
     SetTaskPushNotificationConfigRequest,
@@ -501,7 +502,7 @@ async def on_set_task_push_notification_config(
 
     async def on_get_task_push_notification_config(
         self,
-        params: CancelTaskRequest | GetTaskPushNotificationConfigRequest,
+        params: GetTaskPushNotificationConfigRequest,
         context: ServerCallContext | None = None,
     ) -> TaskPushNotificationConfig:
         """Default handler for 'tasks/pushNotificationConfig/get'.
@@ -531,12 +532,12 @@ async def on_get_task_push_notification_config(
             push_notification_config=push_notification_config[0],
         )
 
-    async def on_resubscribe_to_task(
+    async def on_subscribe_to_task(
         self,
         params: SubscribeToTaskRequest,
         context: ServerCallContext | None = None,
     ) -> AsyncGenerator[Event]:
-        """Default handler for 'tasks/resubscribe'.
+        """Default handler for 'SubscribeToTask'.
 
         Allows a client to re-attach to a running streaming task's event stream.
         Requires the task and its queue to still be active.
@@ -575,8 +576,8 @@ async def on_list_task_push_notification_config(
         self,
         params: ListTaskPushNotificationConfigRequest,
         context: ServerCallContext | None = None,
-    ) -> list[TaskPushNotificationConfig]:
-        """Default handler for 'tasks/pushNotificationConfig/list'.
+    ) -> ListTaskPushNotificationConfigResponse:
+        """Default handler for 'ListTaskPushNotificationConfig'.
 
         Requires a `PushConfigStore` to be configured.
         """
@@ -592,13 +593,15 @@ async def on_list_task_push_notification_config(
             task_id
         )
 
-        return [
-            TaskPushNotificationConfig(
-                name=f'tasks/{task_id}/pushNotificationConfigs/{config.id}',
-                push_notification_config=config,
-            )
-            for config in push_notification_config_list
-        ]
+        return ListTaskPushNotificationConfigResponse(
+            configs=[
+                TaskPushNotificationConfig(
+                    name=f'tasks/{task_id}/pushNotificationConfigs/{config.id}',
+                    push_notification_config=config,
+                )
+                for config in push_notification_config_list
+            ]
+        )
 
     async def on_delete_task_push_notification_config(
         self,

src/a2a/server/request_handlers/grpc_handler.py

@@ -224,7 +224,7 @@ async def SubscribeToTask(
         """
         try:
             server_context = self.context_builder.build(context)
-            async for event in self.request_handler.on_resubscribe_to_task(
+            async for event in self.request_handler.on_subscribe_to_task(
                 request,
                 server_context,
             ):

src/a2a/server/request_handlers/jsonrpc_handler.py

@@ -21,13 +21,13 @@
     Message,
     SendMessageRequest,
     SetTaskPushNotificationConfigRequest,
+    SubscribeToTaskRequest,
     Task,
 )
 from a2a.types.extras import (
     AuthenticatedExtendedCardNotConfiguredError,
     InternalError,
     TaskNotFoundError,
-    TaskResubscriptionRequest,
 )
 from a2a.utils import proto_utils
 from a2a.utils.errors import ServerError
@@ -202,24 +202,24 @@ async def on_cancel_task(
 
         return _build_error_response(request_id, TaskNotFoundError())
 
-    async def on_resubscribe_to_task(
+    async def on_subscribe_to_task(
         self,
-        request: TaskResubscriptionRequest,
+        request: SubscribeToTaskRequest,
         context: ServerCallContext | None = None,
     ) -> AsyncIterable[dict[str, Any]]:
-        """Handles the 'tasks/resubscribe' JSON-RPC method.
+        """Handles the 'SubscribeToTask' JSON-RPC method.
 
         Yields response objects as they are produced by the underlying handler's stream.
 
         Args:
-            request: The incoming `TaskResubscriptionRequest` object.
+            request: The incoming `SubscribeToTaskRequest` object.
             context: Context provided by the server.
 
         Yields:
             Dict representations of JSON-RPC responses containing streaming events.
         """
         try:
-            async for event in self.request_handler.on_resubscribe_to_task(
+            async for event in self.request_handler.on_subscribe_to_task(
                 request, context
             ):
                 # Wrap the event in StreamResponse for consistent client parsing
@@ -338,7 +338,7 @@ async def list_push_notification_config(
         request: ListTaskPushNotificationConfigRequest,
         context: ServerCallContext | None = None,
     ) -> dict[str, Any]:
-        """Handles the 'tasks/pushNotificationConfig/list' JSON-RPC method.
+        """Handles the 'ListTaskPushNotificationConfig' JSON-RPC method.
 
         Args:
             request: The incoming `ListTaskPushNotificationConfigRequest` object.
@@ -349,14 +349,11 @@ async def list_push_notification_config(
         """
         request_id = self._get_request_id(context)
         try:
-            configs = await self.request_handler.on_list_task_push_notification_config(
+            response = await self.request_handler.on_list_task_push_notification_config(
                 request, context
             )
-            # configs is a list of TaskPushNotificationConfig protos
-            result = [
-                MessageToDict(c, preserving_proto_field_name=False)
-                for c in configs
-            ]
+            # response is a ListTaskPushNotificationConfigResponse proto
+            result = MessageToDict(response, preserving_proto_field_name=False)
             return _build_success_response(request_id, result)
         except ServerError as e:
             return _build_error_response(