fix(chat): cancel tool call when user sends message without accepting/rejecting diff

[octo-patch]

Fixes #12051

Problem

When multi_edit (or similar tools with respondImmediately: false) presents a diff and the user sends a new message without clicking Accept or Reject, the tool call remains in calling state with no output. constructMessages emits "No tool output", making the model assume the edit succeeded. Subsequent multi_edit calls then fail because their old_string values no longer match the actual (unmodified) file.

Solution

When pending apply states (status "done") are rejected because the user sends a new message, we now also dispatch cancelToolCall for any associated tool call IDs. The tool call transitions from calling to canceled status before messages are constructed and sent to the model.

The model now receives "The user cancelled this tool call." instead of "No tool output", correctly signaling that the edit was not applied.

Testing

• Ask the agent to edit a file using multi_edit
• When the diff appears, type a new message in chat without clicking Accept or Reject
• Before: model receives "No tool output" and proceeds as if edit succeeded
• After: model receives cancellation message and knows the edit was not applied

---

Summary by cubic

Cancel multi_edit (and other respondImmediately: false tools) when the user sends a new chat message without accepting/rejecting the diff. The tool call now moves to canceled, and the model sees a clear cancellation instead of "No tool output."

• Bug Fixes
  • Dispatch cancelToolCall when rejecting pending apply states on new message.
  • Prevents false assumptions about applied edits and multi_edit failures from mismatched old_string values.

^{Written for commit 25bd83d. Summary will update on new commits.}

[github-actions]

Thank you for your submission, we really appreciate it. Like many open-source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution. You can sign the CLA by just posting a Pull Request Comment same as the below format.

---

I have read the CLA Document and I hereby sign the CLA

---

octo-patch seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You can retrigger this bot by commenting recheck in this Pull Request. Posted by the CLA Assistant Lite bot.}

[cubic-dev-ai]

No issues found across 1 file