Cherry-pick 712e23172: fix(agent): forward resolved outbound session context for delivery#1216
Merged
alexey-pelykh merged 1 commit intomainfrom Mar 13, 2026
Conversation
(cherry picked from commit 712e231)
This was referenced Mar 13, 2026
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.
Cherry-pick from upstream
712e23172Summary
Forwards the resolved outbound session context from
agentCommandtodeliverAgentCommandResult, so that delivery uses the pre-built session context rather than re-deriving it. This ensures consistent session context (key + agentId) is available for outbound payload delivery.Conflict Resolution
Three files had rebrand-related conflicts:
getRemoteSkillEligibility; addedbuildOutboundSessionContextimport alongside fork imports). ACP block conflict (fork gutted the ACP execution path; kept fork's empty block — theoutboundSessionadditions to the two remainingdeliverAgentCommandResultcall sites auto-merged).runCliAgentSpy(gutted CLI runner spy); kept only the newdeliverAgentCommandResultSpyaddition.OutboundSessionContext); kept fork'sAgentDeliveryResultimport. Destructuring merged: addedoutboundSessionto params destructuring while preserving fork'sresultMetablock.Cherry-picked-from: 712e231