Cherry-pick 7ef6623bf: fix: forward resolved session key in agent delivery#1218
Merged
alexey-pelykh merged 1 commit intomainfrom Mar 13, 2026
Merged
Conversation
…aw#27584 by @qualiobra) Co-authored-by: Lucas Teixeira Campos Araujo <[email protected]> (cherry picked from commit 7ef6623)
alexey-pelykh
deleted the
cherry-pick/7ef6623bf-forward-session-key-delivery
branch
4 tasks
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
2 participants
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.
Cherry-pick from upstream
7ef6623bfSummary
Follow-up to the session context forwarding changes. Derives
effectiveSessionKeyfrom the outbound session context and threads it through nested agent log output, so that--deliverruns resumed via--session-id(without explicit--session-key) include session context in nested log prefixes.Adaptation
Conflict Resolution
effectiveSessionKeyaddition was placed after the destructuring line, which in the fork also has theresultMetablock. Both are independent additions; included both.Cherry-picked-from: 7ef6623