Skip to content

fix: update Java ADK ResponseConverter to propagate long-running tool IDs on AUTH_REQUIRED state #1428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Aug 17, 2026
+91 −3
Merged

fix: update Java ADK ResponseConverter to propagate long-running tool IDs on AUTH_REQUIRED state #1428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions a2a/src/main/java/com/google/adk/a2a/converters/ResponseConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,9 @@ private static Optional<Event> handleTaskUpdate(
return messageToEvent(value, context, PENDING_STATES.contains(taskState));
});

if (statusEvent.isFinal()) {
if (statusEvent.isFinal()
|| taskState == TaskState.INPUT_REQUIRED
|| taskState == TaskState.AUTH_REQUIRED) {
messageEvent =
messageEvent
.map(Event::toBuilder)
Expand Down Expand Up @@ -256,15 +258,18 @@ public static Event taskToEvent(Task task, InvocationContext invocationContext)

ImmutableList<Part> finalParts = genaiParts.build();
boolean isFinal =
task.getStatus().state().isFinal() || task.getStatus().state() == TaskState.INPUT_REQUIRED;
task.getStatus().state().isFinal()
|| task.getStatus().state() == TaskState.INPUT_REQUIRED
|| task.getStatus().state() == TaskState.AUTH_REQUIRED;

if (finalParts.isEmpty() && !isFinal) {
return emptyEvent(invocationContext);
}
if (!finalParts.isEmpty()) {
eventBuilder.content(fromModelParts(finalParts));
}
if (task.getStatus().state() == TaskState.INPUT_REQUIRED) {
if (task.getStatus().state() == TaskState.INPUT_REQUIRED
|| task.getStatus().state() == TaskState.AUTH_REQUIRED) {
eventBuilder.longRunningToolIds(longRunningToolIds.build());
}
eventBuilder.turnComplete(isFinal);
Expand Down
83 changes: 83 additions & 0 deletions a2a/src/test/java/com/google/adk/a2a/converters/ResponseConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,43 @@ public void taskToEvent_withInputRequired_parsesLongRunningToolIds() {
assertThat(event.longRunningToolIds().get()).containsExactly("call_123", "msg_123");
}

@Test
public void taskToEvent_withAuthRequired_parsesLongRunningToolIds() {
ImmutableMap<String, Object> data =
ImmutableMap.of("name", "myTool", "id", "call_123", "args", ImmutableMap.of());
ImmutableMap<String, Object> metadata =
ImmutableMap.of(
A2AMetadataKey.TYPE.getType(),
"function_call",
A2AMetadataKey.IS_LONG_RUNNING.getType(),
true);
DataPart dataPart = new DataPart(data, metadata);
ImmutableMap<String, Object> statusData =
ImmutableMap.of("name", "messageTools", "id", "msg_123", "args", ImmutableMap.of());
ImmutableMap<String, Object> statusMetadata =
ImmutableMap.of(
A2AMetadataKey.TYPE.getType(),
"function_call",
A2AMetadataKey.IS_LONG_RUNNING.getType(),
true);
DataPart statusDataPart = new DataPart(statusData, statusMetadata);
Message statusMessage =
new Message.Builder()
.role(Message.Role.AGENT)
.parts(ImmutableList.of(statusDataPart))
.build();
TaskStatus status = new TaskStatus(TaskState.AUTH_REQUIRED, statusMessage, null);

Artifact artifact =
new Artifact.Builder().artifactId("artifact-1").parts(ImmutableList.of(dataPart)).build();
Task task = testTask().status(status).artifacts(ImmutableList.of(artifact)).build();

Event event = ResponseConverter.taskToEvent(task, invocationContext);
assertThat(event).isNotNull();
assertThat(event.longRunningToolIds().get()).containsExactly("call_123", "msg_123");
assertThat(event.turnComplete()).hasValue(true);
}

@Test
public void taskToEvent_withDataPartWithoutMetadata_fallsBackToInlineJson() {
DataPart dataPart =
Expand Down Expand Up @@ -597,6 +634,52 @@ public void clientEventToEvent_withFinalTaskStatusUpdateEvent_withoutMessage_ret
assertThat(resultEvent.turnComplete()).hasValue(true);
}

@Test
public void
clientEventToEvent_withAuthRequiredTaskStatusUpdateEvent_evenIfNonFinal_returnsTurnComplete() {
Message statusMessage =
new Message.Builder()
.role(Message.Role.AGENT)
.parts(ImmutableList.of(new TextPart("Auth required message")))
.build();
TaskStatus status = new TaskStatus(TaskState.AUTH_REQUIRED, statusMessage, null);
TaskStatusUpdateEvent updateEvent =
testTaskStatusUpdateEvent().isFinal(false).status(status).build();

TaskUpdateEvent event = new TaskUpdateEvent(testTask().status(status).build(), updateEvent);

Optional<Event> optionalEvent = ResponseConverter.clientEventToEvent(event, invocationContext);
assertThat(optionalEvent).isPresent();
Event resultEvent = optionalEvent.get();
assertThat(resultEvent.content().get().parts().get().get(0).text())
.hasValue("Auth required message");
assertThat(resultEvent.partial().orElse(false)).isFalse();
assertThat(resultEvent.turnComplete()).hasValue(true);
}

@Test
public void
clientEventToEvent_withInputRequiredTaskStatusUpdateEvent_evenIfNonFinal_returnsTurnComplete() {
Message statusMessage =
new Message.Builder()
.role(Message.Role.AGENT)
.parts(ImmutableList.of(new TextPart("Input required message")))
.build();
TaskStatus status = new TaskStatus(TaskState.INPUT_REQUIRED, statusMessage, null);
TaskStatusUpdateEvent updateEvent =
testTaskStatusUpdateEvent().isFinal(false).status(status).build();

TaskUpdateEvent event = new TaskUpdateEvent(testTask().status(status).build(), updateEvent);

Optional<Event> optionalEvent = ResponseConverter.clientEventToEvent(event, invocationContext);
assertThat(optionalEvent).isPresent();
Event resultEvent = optionalEvent.get();
assertThat(resultEvent.content().get().parts().get().get(0).text())
.hasValue("Input required message");
assertThat(resultEvent.partial().orElse(false)).isFalse();
assertThat(resultEvent.turnComplete()).hasValue(true);
}

@Test
public void clientEventToEvent_withNonFinalTaskStatusUpdateEvent_withoutMessage_returnsEmpty() {
TaskStatus status = new TaskStatus(TaskState.WORKING, null, null);
Expand Down
Loading