fix: preserve concurrent tool result order#2321
Open
he-yufeng wants to merge 1 commit into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
ConcurrentToolExecutor used to append results into the shared
tool_resultslist as each async task completed. That made prompt-cache breakpoint order depend on tool runtime instead of the originaltoolUseorder.This keeps each task's results local while the concurrent queue runs, then merges them back in the original tool-use order after the queue drains. Event streaming still happens as tasks finish; only the final
tool_resultsordering changes.Related Issues
Fixes #2112
Documentation PR
No documentation PR. This is a bug fix for existing executor behavior.
Type of Change
Bug fix
Testing
uv run --extra dev pytest tests/strands/tools/executors/test_concurrent.py -quv run --extra dev pytest tests/strands/tools/executors -quv run --extra dev ruff format --check src/strands/tools/executors/concurrent.py tests/strands/tools/executors/test_concurrent.pyuv run --extra dev ruff check src/strands/tools/executors/concurrent.py tests/strands/tools/executors/test_concurrent.pygit diff --checkI ran
hatch run prepareChecklist
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.