Skip to content

fix(core): restore event emitter for detached tool calls #2483

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

Open
wlmwang wants to merge 2 commits into
base: main
Choose a base branch
from
+85 −3
Open

fix(core): restore event emitter for detached tool calls #2483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbfc7f1
fix: preserve AgentEventEmitter context for subagent streaming
wlmwang Jul 29, 2026
2569d9e
test: cover AgentEventEmitter propagation for subagent streaming
wlmwang Jul 29, 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
37 changes: 34 additions & 3 deletions agentscope-core/src/main/java/io/agentscope/core/ReActAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
import reactor.core.publisher.FluxSink;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
import reactor.util.context.Context;

/**
* ReAct (Reasoning and Acting) Agent implementation.
Expand Down Expand Up @@ -2635,9 +2636,39 @@ private Flux<AgentEvent> runToolBatch(
Disposable toolCallsDisposable =
executeToolCalls(approved)
.contextWrite(
ctx ->
ctx.putAll(
parentCtx))
ctx -> {
Context merged =
ctx.putAll(
parentCtx);
if (!merged.hasKey(
SubagentEventBus
.CONTEXT_KEY)
&& !merged
.hasKey(
AgentEventEmitter
.CONTEXT_KEY)) {
if (eventSink
!= null) {
merged =
merged
.put(
AgentEventEmitter
.CONTEXT_KEY,
(AgentEventEmitter)
eventSink
::next);
} else if (externalEventEmitter
!= null) {
merged =
merged
.put(
AgentEventEmitter
.CONTEXT_KEY,
externalEventEmitter);
}
}
return merged;
})
.subscribe(
results -> {
List<
Expand Down
51 changes: 51 additions & 0 deletions agentscope-core/src/test/java/io/agentscope/core/agent/ReActAgentNewLoopE2ETest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import io.agentscope.core.ReActAgent;
import io.agentscope.core.event.AgentEndEvent;
import io.agentscope.core.event.AgentEvent;
import io.agentscope.core.event.AgentEventEmitter;
import io.agentscope.core.event.AgentStartEvent;
import io.agentscope.core.event.ModelCallEndEvent;
import io.agentscope.core.event.ToolCallEndEvent;
Expand Down Expand Up @@ -184,6 +185,21 @@ public Flux<AgentEvent> onActing(
}
}

private static final class StripToolEventContextMiddleware implements MiddlewareBase {
@Override
public Flux<AgentEvent> onActing(
Agent agent,
RuntimeContext ctx,
ActingInput input,
Function<ActingInput, Flux<AgentEvent>> next) {
return next.apply(input)
.contextWrite(
context ->
context.delete(SubagentEventBus.CONTEXT_KEY)
.delete(AgentEventEmitter.CONTEXT_KEY));
}
}

@Test
void twoToolReactLoopProducesOrderedEventsAndFinalText() {
ScriptedModel model =
Expand Down Expand Up @@ -292,4 +308,39 @@ void toolReturningErrorBlockEmitsErrorResultEndState() {
.orElseThrow();
assertEquals(ToolResultState.ERROR, end.getState());
}

@Test
void streamEventsRestoresEmitterWhenActingContextLosesEventKeys() {
ScriptedModel model =
new ScriptedModel(
List.of(
() -> Flux.just(toolUseResponse("c1", "search", "alpha")),
() -> Flux.just(textResponse("done"))));
Toolkit tk = new Toolkit();
tk.registerAgentTool(new AlwaysAllowTool("search"));

ReActAgent agent =
ReActAgent.builder()
.name("asst")
.sysPrompt("you are helpful")
.model(model)
.toolkit(tk)
.middleware(new StripToolEventContextMiddleware())
.build();

List<AgentEvent> events =
agent.streamEvents(
List.of(
Msg.builder()
.role(MsgRole.USER)
.textContent("find alpha")
.build()))
.collectList()
.block();

assertNotNull(events);
assertEquals(1L, events.stream().filter(ToolResultEndEvent.class::isInstance).count());
assertTrue(events.get(0) instanceof AgentStartEvent);
assertTrue(events.get(events.size() - 1) instanceof AgentEndEvent);
}
}
Loading