fix: defer non-stream session saves until output guardrails - #4184
Merged
Conversation
Co-authored-by: Henry Su <henrysu4707@gmail.com>
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
1 participant
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.
This pull request fixes non-streamed session persistence so assistant output rejected by an output guardrail is not replayed on later turns.
It supersedes the closed #3998. That PR identified the underlying bug, but its branch diverged from current main after #4148 established the shared blocked-output retention behavior, and its split-save approach could lose or reorder mixed final-turn items.
This replacement reuses the retention policy from #4148, persists accepted final turns as one ordered batch, retains committed tool and reasoning records when a tripwire fires, and keeps resumed
RunStatepersistence counts exact. It also preserves the released behavior for ordinary guardrail errors and cancellation.