Fix prompt truncation with tool messages - #7655
Open
wmcgyver 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.
Summary
Fixes prompt truncation when tool messages follow the current user message.
When the prompt exceeds the context limit, the existing truncation logic can treat the current user message as old history and remove it. The following assistant tool-call and tool-result messages are then also removed, leaving
messagesempty and causingmake_prompt()to fail atmessages[-1].This change tracks the most recent user message, only removes history preceding it, and truncates that user message directly when necessary.
Testing
python -m py_compile modules/chat.pygit diff --checkweb_searchtool-call continuations after truncation.fetch_webpagecalls followed by successful model continuation.messages/IndexErroroccurred after the change.