Skip to content

fix(agui): fix AG-UI reasoning/tool event handling #1231

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
LearningGp merged 2 commits into from
Apr 28, 2026
+82 −4
Merged

fix(agui): fix AG-UI reasoning/tool event handling #1231

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5fe9cc
fix(agui): fix AG-UI reasoning/tool event handling
jujn Apr 16, 2026
8e54e8f
fix: copilot review
jujn Apr 16, 2026
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
31 changes: 29 additions & 2 deletions ...scope-extensions-agui/src/main/java/io/agentscope/core/agui/adapter/AguiAgentAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ private List<AguiEvent> convertEvent(Event event, EventConversionState state) {
state.threadId,
state.runId,
messageId,
"assistant"));
"reasoning"));
state.startReasoningMessage(messageId);
}

Expand Down Expand Up @@ -212,6 +212,15 @@ private List<AguiEvent> convertEvent(Event event, EventConversionState state) {
state.endMessage(activeMessageId);
}

// End any active reasoning message before starting tool call
if (state.hasActiveReasoningMessage()) {
String activeReasoningMessageId = state.getCurrentReasoningMessageId();
events.add(
new AguiEvent.ReasoningMessageEnd(
state.threadId, state.runId, activeReasoningMessageId));
state.endReasoningMessage(activeReasoningMessageId);
}

// Emit tool call start
String toolCallId = toolUse.getId();
if (toolCallId == null) {
Expand Down Expand Up @@ -248,9 +257,13 @@ private List<AguiEvent> convertEvent(Event event, EventConversionState state) {

boolean hasStarted = state.hasStartedToolCall(toolCallId);
if (!hasStarted) {
String toolName = toolResult.getName();
if (toolName == null || toolName.isBlank()) {
toolName = "unknown";
}
Comment thread
jujn marked this conversation as resolved.
events.add(
new AguiEvent.ToolCallStart(
state.threadId, state.runId, toolCallId, "unknown"));
state.threadId, state.runId, toolCallId, toolName));
state.startToolCall(toolCallId);
}

Expand Down Expand Up @@ -365,6 +378,7 @@ private static class EventConversionState {
private final Set<String> startedReasoningMessages = new LinkedHashSet<>();
private final Set<String> endedReasoningMessages = new LinkedHashSet<>();
private String currentTextMessageId = null;
private String currentReasoningMessageId = null;

EventConversionState(String threadId, String runId) {
this.threadId = threadId;
Expand Down Expand Up @@ -429,16 +443,29 @@ boolean hasStartedReasoningMessage(String messageId) {

void startReasoningMessage(String messageId) {
startedReasoningMessages.add(messageId);
currentReasoningMessageId = messageId;
}

void endReasoningMessage(String messageId) {
endedReasoningMessages.add(messageId);
if (messageId.equals(currentReasoningMessageId)) {
Comment thread
jujn marked this conversation as resolved.
Outdated
currentReasoningMessageId = null;
}
}

boolean hasEndedReasoningMessage(String messageId) {
return endedReasoningMessages.contains(messageId);
}

String getCurrentReasoningMessageId() {
return currentReasoningMessageId;
}

boolean hasActiveReasoningMessage() {
return currentReasoningMessageId != null
&& !hasEndedReasoningMessage(currentReasoningMessageId);
}

Set<String> getStartedReasoningMessages() {
return startedReasoningMessages;
}
Expand Down
49 changes: 48 additions & 1 deletion ...e-extensions-agui/src/test/java/io/agentscope/core/agui/adapter/AguiAgentAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ void testRunWithThinkingBlockEvent() {

assertNotNull(reasoningMessageStart, "Should have ReasoningMessageStart");
assertEquals("msg-r1", reasoningMessageStart.messageId());
assertEquals("assistant", reasoningMessageStart.role());
assertEquals("reasoning", reasoningMessageStart.role());

AguiEvent.ReasoningMessageContent reasoningMessageContent =
events.stream()
Expand Down Expand Up @@ -989,6 +989,7 @@ void testToolCallStartBackfillWithoutCache() {
.content(
ToolResultBlock.builder()
.id("tc-unknown")
.name("weather_lookup")
.output(TextBlock.builder().text("result").build())
.build())
.build();
Expand All @@ -1013,6 +1014,17 @@ void testToolCallStartBackfillWithoutCache() {
long toolStartCount =
events.stream().filter(e -> e instanceof AguiEvent.ToolCallStart).count();
assertEquals(1, toolStartCount, "Should backfill ToolCallStart for unknown tool result");

AguiEvent.ToolCallStart backfilledStart =
events.stream()
.filter(e -> e instanceof AguiEvent.ToolCallStart)
.map(e -> (AguiEvent.ToolCallStart) e)
.findFirst()
.orElse(null);

assertNotNull(backfilledStart, "Should backfill ToolCallStart");
assertEquals("tc-unknown", backfilledStart.toolCallId());
assertEquals("weather_lookup", backfilledStart.toolCallName());
}

@Test
Expand Down Expand Up @@ -1291,6 +1303,41 @@ void testRunWithThinkingAndToolCallMixed() {
assertTrue(hasReasoningMessageStart, "Should have ReasoningMessageStart");
assertTrue(hasReasoningMessageContent, "Should have ReasoningMessageContent");
assertTrue(hasToolStart, "Should have ToolCallStart for tool call");

int reasoningStartIdx = -1;
int reasoningContentIdx = -1;
int reasoningEndIdx = -1;
int toolStartIdx = -1;

for (int i = 0; i < events.size(); i++) {
AguiEvent e = events.get(i);
if (reasoningStartIdx < 0 && e instanceof AguiEvent.ReasoningMessageStart) {
reasoningStartIdx = i;
} else if (reasoningContentIdx < 0 && e instanceof AguiEvent.ReasoningMessageContent) {
reasoningContentIdx = i;
} else if (reasoningEndIdx < 0 && e instanceof AguiEvent.ReasoningMessageEnd) {
reasoningEndIdx = i;
} else if (toolStartIdx < 0 && e instanceof AguiEvent.ToolCallStart) {
toolStartIdx = i;
}
}

assertTrue(reasoningStartIdx >= 0, "Should have ReasoningMessageStart");
assertTrue(reasoningContentIdx >= 0, "Should have ReasoningMessageContent");
assertTrue(reasoningEndIdx >= 0, "Should have ReasoningMessageEnd before tool call");
assertTrue(toolStartIdx >= 0, "Should have ToolCallStart");

assertTrue(
reasoningStartIdx < reasoningContentIdx,
"Reasoning start should be before content");
assertTrue(reasoningContentIdx < reasoningEndIdx, "Reasoning content should be before end");
assertTrue(
reasoningEndIdx < toolStartIdx, "Reasoning should be closed before ToolCallStart");

// ReasoningMessage must be explicitly closed before ToolCallStart.
long reasoningEndCount =
events.stream().filter(e -> e instanceof AguiEvent.ReasoningMessageEnd).count();
assertEquals(1, reasoningEndCount, "Should emit exactly one ReasoningMessageEnd");
}

@Test
Expand Down
Loading