Skip to content

Commit 2ba8e7b

Browse files
authored
fix(server): infer contextId from task when only taskId is provided (a2aproject#1453)
## Issue A message carrying only `taskId` got a freshly generated `contextId` instead of the one from the task it names. Spec 3.4.3 requires inferring it from the task. ## Change Both handlers now take the `contextId` from the stored task when the message doesn't provide one. The existing mismatch rejection is unchanged. ## Tests Added tests for v2 (blocking + streaming) and legacy, asserting the executor and the emitted events get the task's context. Updated two existing terminal-state tests whose mocked task store wasn't returning a real task. closes a2aproject#1411
1 parent 2bddd06 commit 2ba8e7b

4 files changed

Lines changed: 131 additions & 1 deletion

File tree

‎src/a2a/server/request_handlers/default_request_handler.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,9 @@ async def _setup_message_execution(
316316
)
317317

318318
task = task_manager.update_with_message(params.message, task)
319+
# Agents must infer the contextId from the task when the message
320+
# names only a taskId.
321+
context_id = context_id or task.context_id
319322
elif params.message.task_id:
320323
raise TaskNotFoundError(
321324
message=f'Task {params.message.task_id} was specified but does not exist'
@@ -325,7 +328,7 @@ async def _setup_message_execution(
325328
request_context = await self._request_context_builder.build(
326329
params=params,
327330
task_id=task.id if task else None,
328-
context_id=params.message.context_id,
331+
context_id=context_id,
329332
task=task,
330333
context=context,
331334
)

‎src/a2a/server/request_handlers/default_request_handler_v2.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,9 @@ async def _setup_active_task(
428428
f'context {task.context_id} of task {original_task_id}'
429429
)
430430
)
431+
# Agents must infer the contextId from the task when the message
432+
# names only a taskId.
433+
original_context_id = original_context_id or task.context_id
431434

432435
# Build context to resolve or generate missing IDs
433436
request_context = await self._request_context_builder.build(

‎tests/server/request_handlers/test_default_request_handler.py‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3545,3 +3545,59 @@ async def test_push_sender_failure_does_not_propagate(agent_card):
35453545
await request_handler._send_push_notification_if_needed(event.id, event)
35463546

35473547
mock_push_sender.send_notification.assert_awaited_once_with(event.id, event)
3548+
3549+
3550+
class _ContextRecordingAgent(AgentExecutor):
3551+
"""Records the context id each execution is handed."""
3552+
3553+
def __init__(self) -> None:
3554+
self.seen_context_ids: list[str | None] = []
3555+
3556+
async def execute(
3557+
self, context: RequestContext, event_queue: EventQueue
3558+
) -> None:
3559+
self.seen_context_ids.append(context.context_id)
3560+
updater = TaskUpdater(
3561+
event_queue,
3562+
context.task_id, # type: ignore[arg-type]
3563+
context.context_id, # type: ignore[arg-type]
3564+
)
3565+
await updater.complete()
3566+
3567+
async def cancel(
3568+
self, context: RequestContext, event_queue: EventQueue
3569+
) -> None:
3570+
pass
3571+
3572+
3573+
@pytest.mark.asyncio
3574+
async def test_task_only_message_infers_context_id_from_task(agent_card):
3575+
"""A2A 3.4.3: a message naming only a taskId inherits the task's context."""
3576+
agent = _ContextRecordingAgent()
3577+
task_store = InMemoryTaskStore()
3578+
call_context = create_server_call_context()
3579+
task = create_sample_task(
3580+
task_id='task-awaiting-input',
3581+
status_state=TaskState.TASK_STATE_INPUT_REQUIRED,
3582+
context_id='ctx-from-stored-task',
3583+
)
3584+
await task_store.save(task, call_context)
3585+
handler = DefaultRequestHandler(
3586+
agent_executor=agent,
3587+
task_store=task_store,
3588+
agent_card=agent_card,
3589+
)
3590+
params = SendMessageRequest(
3591+
message=Message(
3592+
message_id='msg-follow-up',
3593+
role=Role.ROLE_USER,
3594+
parts=[Part(text='Friday')],
3595+
task_id=task.id,
3596+
)
3597+
)
3598+
3599+
result = await handler.on_message_send(params, call_context)
3600+
3601+
assert agent.seen_context_ids == [task.context_id]
3602+
assert result.context_id == task.context_id
3603+
assert params.message.context_id == task.context_id

‎tests/server/request_handlers/test_default_request_handler_v2.py‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,6 +1335,7 @@ async def test_on_message_send_task_in_terminal_state(terminal_state):
13351335
task_id=task_id, status_state=terminal_state
13361336
)
13371337
mock_task_store = AsyncMock(spec=TaskStore)
1338+
mock_task_store.get.return_value = terminal_task
13381339
request_handler = DefaultRequestHandlerV2(
13391340
agent_executor=MockAgentExecutor(),
13401341
task_store=mock_task_store,
@@ -1374,6 +1375,7 @@ async def test_on_message_send_stream_task_in_terminal_state(terminal_state):
13741375
task_id=task_id, status_state=terminal_state
13751376
)
13761377
mock_task_store = AsyncMock(spec=TaskStore)
1378+
mock_task_store.get.return_value = terminal_task
13771379
request_handler = DefaultRequestHandlerV2(
13781380
agent_executor=MockAgentExecutor(),
13791381
task_store=mock_task_store,
@@ -3068,6 +3070,72 @@ async def send(tag: str, message: Message) -> None:
30683070
await handler.aclose()
30693071

30703072

3073+
class _ContextRecordingAgent(AgentExecutor):
3074+
"""Records the context id each execution is handed."""
3075+
3076+
def __init__(self) -> None:
3077+
self.seen_context_ids: list[str | None] = []
3078+
3079+
async def execute(
3080+
self, context: RequestContext, event_queue: EventQueue
3081+
) -> None:
3082+
self.seen_context_ids.append(context.context_id)
3083+
updater = TaskUpdater(event_queue, context.task_id, context.context_id)
3084+
await updater.complete()
3085+
3086+
async def cancel(
3087+
self, context: RequestContext, event_queue: EventQueue
3088+
) -> None:
3089+
pass
3090+
3091+
3092+
@pytest.mark.asyncio
3093+
@pytest.mark.parametrize('streaming', [False, True])
3094+
async def test_task_only_message_infers_context_id_from_task(streaming):
3095+
"""A2A 3.4.3: a message naming only a taskId inherits the task's context."""
3096+
agent = _ContextRecordingAgent()
3097+
task_store = InMemoryTaskStore()
3098+
call_context = create_server_call_context()
3099+
task = Task(
3100+
id='task-awaiting-input',
3101+
context_id='ctx-from-stored-task',
3102+
status=TaskStatus(state=TaskState.TASK_STATE_INPUT_REQUIRED),
3103+
)
3104+
await task_store.save(task, call_context)
3105+
handler = DefaultRequestHandlerV2(
3106+
agent_executor=agent,
3107+
task_store=task_store,
3108+
agent_card=create_default_agent_card(),
3109+
)
3110+
params = SendMessageRequest(
3111+
message=Message(
3112+
message_id='msg-follow-up',
3113+
role=Role.ROLE_USER,
3114+
parts=[Part(text='aaa')],
3115+
task_id=task.id,
3116+
)
3117+
)
3118+
3119+
if streaming:
3120+
events = [
3121+
event
3122+
async for event in handler.on_message_send_stream(
3123+
params, call_context
3124+
)
3125+
]
3126+
else:
3127+
events = [await handler.on_message_send(params, call_context)]
3128+
3129+
assert agent.seen_context_ids == [task.context_id]
3130+
assert events
3131+
assert all(event.context_id == task.context_id for event in events)
3132+
assert params.message.context_id == task.context_id
3133+
stored = await task_store.get(task.id, call_context)
3134+
assert stored is not None
3135+
assert stored.context_id == task.context_id
3136+
await handler.aclose()
3137+
3138+
30713139
def _complete_agent_card() -> AgentCard:
30723140
"""Returns an AgentCard with every field the A2A spec marks REQUIRED."""
30733141
return AgentCard(

0 commit comments

Comments
 (0)