From fc31d03e8c6acb68660f6d1924262e16933c5d50 Mon Sep 17 00:00:00 2001
From: Iva Sokolaj <102302011+sokoliva@users.noreply.github.com>
Date: Fri, 21 Nov 2025 12:53:53 +0100
Subject: [PATCH 1/2] fix: Ensure metadata propagation for `Task` `ToProto` and
 `FromProto` conversion (#557)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The `metadata` dictionary is now correctly propagated in both the
`ToProto` (types.Task to a2a_pb2.Task) and `FromProto` (a2a_pb2.Task to
types.Task) conversion utilities.

Release-As:0.3.16

Fixes #541 🦕
---
 src/a2a/utils/proto_utils.py    |  2 ++
 tests/utils/test_proto_utils.py | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/a2a/utils/proto_utils.py b/src/a2a/utils/proto_utils.py
index d077d62bf..8bf01eea9 100644
--- a/src/a2a/utils/proto_utils.py
+++ b/src/a2a/utils/proto_utils.py
@@ -203,6 +203,7 @@ def task(cls, task: types.Task) -> a2a_pb2.Task:
                 if task.history
                 else None
             ),
+            metadata=cls.metadata(task.metadata),
         )
 
     @classmethod
@@ -660,6 +661,7 @@ def task(cls, task: a2a_pb2.Task) -> types.Task:
             status=cls.task_status(task.status),
             artifacts=[cls.artifact(a) for a in task.artifacts],
             history=[cls.message(h) for h in task.history],
+            metadata=cls.metadata(task.metadata),
         )
 
     @classmethod
diff --git a/tests/utils/test_proto_utils.py b/tests/utils/test_proto_utils.py
index da54f833f..33be1f3f7 100644
--- a/tests/utils/test_proto_utils.py
+++ b/tests/utils/test_proto_utils.py
@@ -52,6 +52,7 @@ def sample_task(sample_message: types.Message) -> types.Task:
                 ],
             )
         ],
+        metadata={'source': 'test'},
     )
 
 
@@ -508,3 +509,30 @@ def test_large_integer_roundtrip_with_utilities(self):
         assert final_result['nested']['another_large'] == 12345678901234567890
         assert isinstance(final_result['nested']['another_large'], int)
         assert final_result['nested']['normal'] == 'text'
+
+    def test_task_conversion_roundtrip(
+        self, sample_task: types.Task, sample_message: types.Message
+    ):
+        """Test conversion of Task to proto and back."""
+        proto_task = proto_utils.ToProto.task(sample_task)
+        assert isinstance(proto_task, a2a_pb2.Task)
+
+        roundtrip_task = proto_utils.FromProto.task(proto_task)
+        assert roundtrip_task.id == 'task-1'
+        assert roundtrip_task.context_id == 'ctx-1'
+        assert roundtrip_task.status == types.TaskStatus(
+            state=types.TaskState.working, message=sample_message
+        )
+        assert roundtrip_task.history == [sample_message]
+        assert roundtrip_task.artifacts == [
+            types.Artifact(
+                artifact_id='art-1',
+                description='',
+                metadata={},
+                name='',
+                parts=[
+                    types.Part(root=types.TextPart(text='Artifact content'))
+                ],
+            )
+        ]
+        assert roundtrip_task.metadata == {'source': 'test'}

From dbc73e84020d9ca6dae2eca5bcf5820580ca2edf Mon Sep 17 00:00:00 2001
From: "Agent2Agent (A2A) Bot" <a2a-bot@google.com>
Date: Fri, 21 Nov 2025 07:34:03 -0600
Subject: [PATCH 2/2] chore(main): release 0.3.16 (#562)

:robot: I have created a release *beep* *boop*
---


##
[0.3.16](https://github.com/a2aproject/a2a-python/compare/v0.3.15...v0.3.16)
(2025-11-21)


### Bug Fixes

* Ensure metadata propagation for `Task` `ToProto` and `FromProto`
conversion ([#557](https://github.com/a2aproject/a2a-python/issues/557))
([fc31d03](https://github.com/a2aproject/a2a-python/commit/fc31d03e8c6acb68660f6d1924262e16933c5d50))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
---
 CHANGELOG.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5e6048de..026e8fd1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,11 @@
- # Changelog
+# Changelog
+
+## [0.3.16](https://github.com/a2aproject/a2a-python/compare/v0.3.15...v0.3.16) (2025-11-21)
+
+
+### Bug Fixes
+
+* Ensure metadata propagation for `Task` `ToProto` and `FromProto` conversion ([#557](https://github.com/a2aproject/a2a-python/issues/557)) ([fc31d03](https://github.com/a2aproject/a2a-python/commit/fc31d03e8c6acb68660f6d1924262e16933c5d50))
 
 ## [0.3.15](https://github.com/a2aproject/a2a-python/compare/v0.3.14...v0.3.15) (2025-11-19)