fix(gateway): preserve document type when merging queued events#18215
Merged
Conversation
1 task
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.
Salvage of #16589 by @hharry11 onto current main.
Summary
Cherry-picked on top of current main (branch was 621 commits behind). Clean pick, no conflicts, authorship preserved.
What the fix does
In
merge_pending_message_event, when a queued TEXT event absorbs an incoming non-text media event (DOCUMENT, AUDIO, VIDEO), promote the merged event'smessage_typeto the incoming type. Existing PHOTO precedence is untouched.Why it matters
Session busy → user sends text → user sends a PDF/audio/video. The queued event kept
message_type=TEXTeven after inheriting the document'smedia_urls/media_types. Downstreamgateway/run.py:5157gates document content-injection onmessage_type == DOCUMENT, so the agent received only a bare file path with no context note.Validation
tests/gateway/test_session_race_guard.py17/17 pass (includes new regression test)Closes #16589.