Skip to content

fix(hook): PendingToolRecoveryHook false positive on historical ToolResultBlocks in multi-turn (#1555) #1566

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
Sparkle6979 wants to merge 3 commits into
base: main
Choose a base branch
from
+614 −1
Open

fix(hook): PendingToolRecoveryHook false positive on historical ToolResultBlocks in multi-turn (#1555) #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41372bd
：fix: PendingToolRecoveryHook checks ToolResultBlock IDs against pend…
Sparkle6979 Jun 1, 2026
ea2f342
Merge branch 'agentscope-ai:main' into fix/pending-tool-recovery-mult…
Sparkle6979 Jun 1, 2026
283718a
test: add multi-turn tests for PendingToolRecoveryHook fix
Sparkle6979 Jun 1, 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
4 changes: 3 additions & 1 deletion agentscope-core/src/main/java/io/agentscope/core/hook/PendingToolRecoveryHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ private Mono<PreCallEvent> handlePreCall(PreCallEvent event) {
}

boolean userProvidedResults =
inputMessages.stream().anyMatch(m -> m.hasContentBlocks(ToolResultBlock.class));
inputMessages.stream()
.flatMap(m -> m.getContentBlocks(ToolResultBlock.class).stream())
.anyMatch(tr -> pendingIds.contains(tr.getId()));
Comment thread
LearningGp marked this conversation as resolved.

@AgentScopeJavaBot AgentScopeJavaBot Jun 2, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nit] Defensive consideration only (not a real bug today): ToolResultBlock.getId() is documented as nullable, and Set#contains(null) is a legal lookup. In normal flows pendingIds is sourced from non-null ToolUseBlock ids so a null result-id cannot match, but if a malformed user message ever ships a null-id ToolResultBlock the hook will silently ignore it (treat as not-HITL and auto-patch). That is arguably the safer behavior, so no change required — flagging only so the assumption is explicit.

if (userProvidedResults) {
return Mono.just(event);
}
Expand Down
Loading
Loading