From 38c00f82413430172cc1937297755715b74d2239 Mon Sep 17 00:00:00 2001
From: Marcin Belczewski <marcin.belczewski@gmail.com>
Date: Fri, 2 Oct 2026 14:45:57 +0200
Subject: [PATCH] fix(server): keep follow-up message when the executor
 re-emits the current task

---
 src/a2a/server/agent_execution/active_task.py | 11 +--
 tests/integration/test_scenarios.py           | 76 +++++++++++++++++++
 2 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/src/a2a/server/agent_execution/active_task.py b/src/a2a/server/agent_execution/active_task.py
index ab35a6bda..9851a91ba 100644
--- a/src/a2a/server/agent_execution/active_task.py
+++ b/src/a2a/server/agent_execution/active_task.py
@@ -275,13 +275,14 @@ async def _handle_task_event(
     async def _handle_initial_task(self, event: Task) -> None:
         existing_task = await self.active_task._task_manager.get_task()
         if existing_task:
-            logger.error(
-                'Task %s already exists. Ignoring task replacement.',
-                self.active_task._task_id,
-            )
+            if self.message_to_save is None:
+                logger.error(
+                    'Task %s already exists. Ignoring task replacement.',
+                    self.active_task._task_id,
+                )
         else:
             await self.active_task._task_manager.save_task_event(event)
-        self.message_to_save = None
+            self.message_to_save = None
 
     async def _handle_task_modification_event(
         self,
diff --git a/tests/integration/test_scenarios.py b/tests/integration/test_scenarios.py
index 10e86a6a5..e57560414 100644
--- a/tests/integration/test_scenarios.py
+++ b/tests/integration/test_scenarios.py
@@ -1190,6 +1190,82 @@ def test_input_required_followup_across_per_rpc_event_loops():
     assert result2.status.state == TaskState.TASK_STATE_COMPLETED
 
 
+# Scenario: Streaming resumption that enqueues the current Task first
+@pytest.mark.timeout(2.0)
+@pytest.mark.asyncio
+async def test_scenario_streaming_resumption_enqueues_current_task(caplog):
+    class CurrentTaskAgent(AgentExecutor):
+        async def execute(
+            self, context: RequestContext, event_queue: EventQueue
+        ):
+            task = context.current_task or new_task_from_user_message(
+                context.message
+            )
+            await event_queue.enqueue_event(task)
+            await event_queue.enqueue_event(
+                TaskStatusUpdateEvent(
+                    task_id=task.id,
+                    context_id=task.context_id,
+                    status=TaskStatus(
+                        state=TaskState.TASK_STATE_COMPLETED
+                        if context.current_task
+                        else TaskState.TASK_STATE_INPUT_REQUIRED
+                    ),
+                )
+            )
+
+        async def cancel(
+            self, context: RequestContext, event_queue: EventQueue
+        ):
+            pass
+
+    handler = create_handler(CurrentTaskAgent(), use_legacy=False)
+    client = await create_client(
+        handler, agent_card=agent_card(), streaming=True
+    )
+
+    msg1 = Message(
+        message_id='msg-start', role=Role.ROLE_USER, parts=[Part(text='start')]
+    )
+    it = client.send_message(
+        SendMessageRequest(
+            message=msg1,
+            configuration=SendMessageConfiguration(return_immediately=False),
+        )
+    )
+    events1 = [event async for event in it]
+    task_id = get_task_id(events1[0])
+    context_id = get_task_context_id(events1[0])
+
+    msg2 = Message(
+        task_id=task_id,
+        context_id=context_id,
+        message_id='msg-resume',
+        role=Role.ROLE_USER,
+        parts=[Part(text='here is input')],
+    )
+    it2 = client.send_message(
+        SendMessageRequest(
+            message=msg2,
+            configuration=SendMessageConfiguration(return_immediately=False),
+        )
+    )
+    events2 = [event async for event in it2]
+
+    assert events2[0].HasField('task')
+    validate_state(events2[-1], TaskState.TASK_STATE_COMPLETED)
+
+    final_task = await client.get_task(GetTaskRequest(id=task_id))
+    assert [message.message_id for message in final_task.history] == [
+        'msg-start',
+        'msg-resume',
+    ]
+    assert not any(
+        'Ignoring task replacement' in record.message
+        for record in caplog.records
+    )
+
+
 # Scenario: Auth required and side channel unblocking
 # Migrated from: test_workflow_auth_required_side_channel in test_handler_comparison
 @pytest.mark.timeout(2.0)