Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,9 @@ public Flow.Publisher<EventQueueItem> consumeAll() {
boolean isFinalEvent = false;
if (event instanceof TaskStatusUpdateEvent tue && tue.isFinal()) {
isFinalEvent = true;
} else if (event instanceof Message) {
// Per A2A spec §3.1.2 (Send Streaming Message): a Message is the
// complete response — the stream must close after delivering it.
} else if (event instanceof Message && lastSeenTaskState == null) {
// A stateless Message is the complete response. Messages emitted
// after a task has started are intermediate task stream events.
isFinalEvent = true;
} else if (event instanceof Task task) {
isFinalEvent = isStreamTerminatingTask(task);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,41 @@ public void testConsumeMessageEvents() throws Exception {
assertSame(message, receivedEvents.get(0));
}

@Test
public void testConsumeTaskMessageBeforeInputRequired() throws Exception {
Task workingTask = Task.builder()
.id(TASK_ID)
.contextId("session-xyz")
.status(new TaskStatus(TaskState.TASK_STATE_WORKING))
.build();
Message message = fromJson(MESSAGE_PAYLOAD, Message.class);
TaskStatusUpdateEvent inputRequiredEvent = TaskStatusUpdateEvent.builder()
.taskId(TASK_ID)
.contextId("session-xyz")
.status(new TaskStatus(TaskState.TASK_STATE_INPUT_REQUIRED))
.build();
TaskStatusUpdateEvent completedEvent = TaskStatusUpdateEvent.builder()
.taskId(TASK_ID)
.contextId("session-xyz")
.status(new TaskStatus(TaskState.TASK_STATE_COMPLETED))
.build();
List<Event> events = List.of(workingTask, message, inputRequiredEvent, completedEvent);

for (Event event : events) {
eventQueue.enqueueEvent(event);
}

List<Event> receivedEvents = new ArrayList<>();
AtomicReference<Throwable> error = new AtomicReference<>();
eventConsumer.consumeAll().subscribe(getSubscriber(receivedEvents, error));

assertNull(error.get());
assertEquals(events.size(), receivedEvents.size());
for (int i = 0; i < events.size(); i++) {
assertSame(events.get(i), receivedEvents.get(i));
}
}

@Test
public void testBufferFlushDelayMsDefaultsTo150() {
String original = System.getProperty("a2a.eventconsumer.bufferFlushDelayMs");
Expand Down
Loading