Skip to content

fix: allow text after any tool call #6013

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

Closed
daniel-lxs wants to merge 3 commits into from
Closed

fix: allow text after any tool call #6013

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f55493
fix: allow text content after update_todo_list tool (#5847)
daniel-lxs Jul 21, 2025
d2c1a26
fix: allow text after update_todo_list and support multiple calls
daniel-lxs Jul 21, 2025
3bce917
fix: remove special condition for update_todo_list tool
roomote Jul 22, 2025
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
9 changes: 7 additions & 2 deletions src/core/assistant-message/presentAssistantMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export async function presentAssistantMessage(cline: Task) {

switch (block.type) {
case "text": {
if (cline.didRejectTool || cline.didAlreadyUseTool) {
if (cline.didRejectTool) {
break
}

Expand Down Expand Up @@ -551,7 +551,12 @@ export async function presentAssistantMessage(cline: Task) {
// skip execution since `didRejectTool` and iterate until `contentIndex` is
// set to message length and it sets userMessageContentReady to true itself
// (instead of preemptively doing it in iterator).
if (!block.partial || cline.didRejectTool || cline.didAlreadyUseTool) {
if (
!block.partial ||
cline.didRejectTool ||
(cline.didAlreadyUseTool && block.type !== "tool_use") ||
(cline.didAlreadyUseTool && block.type === "tool_use")
) {
Comment on lines +554 to +559
Copy link
Collaborator

@mrubens mrubens Jul 23, 2025

Choose a reason for hiding this comment

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

Is this any different than it was before?

Copy link
Member Author

@daniel-lxs daniel-lxs Jul 24, 2025

Choose a reason for hiding this comment

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

This allows the system to continue processing text blocks even after a tool has been used, while still preventing multiple tool executions in the same message.

Copy link
Collaborator

@mrubens mrubens Jul 29, 2025

Choose a reason for hiding this comment

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

Hmm, maybe I'm not seeing it but the logic looks identical

// Block is finished streaming and executing.
if (cline.currentStreamingContentIndex === cline.assistantMessageContent.length - 1) {
// It's okay that we increment if !didCompleteReadingStream, it'll
Expand Down