Handle multiple tool calls in ChatSession#162
Merged
davidkoski merged 1 commit intoml-explore:mainfrom Mar 27, 2026
Merged
Conversation
The generation loop was breaking on the first tool call, canceling the stream, and losing the rest. Now it drains the stream, collects all tool calls, dispatches them, and restarts with all tool results. Skips dispatch if the consumer has canceled (Task.isCancelled). No change to the streamDetails path. Fixes ml-explore#134.
davidkoski
approved these changes
Mar 27, 2026
Collaborator
davidkoski
left a comment
davidkoski
left a comment
There was a problem hiding this comment.
Nice and simple, thank you!
TheTom
pushed a commit
to TheTom/mlx-swift-lm
that referenced
this pull request
Apr 5, 2026
The generation loop was breaking on the first tool call, canceling the stream, and losing the rest. Now it drains the stream, collects all tool calls, dispatches them, and restarts with all tool results. Skips dispatch if the consumer has canceled (Task.isCancelled). No change to the streamDetails path. Fixes ml-explore#134.
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
2 participants
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.
Fixes #134.
The generation loop was breaking on the first tool call, canceling the stream, and losing the rest. Now it drains the stream, collects all tool calls, dispatches them, and restarts with all tool results. Works for both mid-stream (JSON/XML tagged) and EOS-emitted (Mistral) tool calls.
Skips dispatch if the consumer has canceled. No change to the
streamDetailspath — callers withouttoolDispatchstill get tool call items directly.