Skip to content

Cherry-pick 712e23172: fix(agent): forward resolved outbound session context for delivery#1216

Merged
alexey-pelykh merged 1 commit intomainfrom
cherry-pick/712e23172-forward-outbound-session-context
Mar 13, 2026
Merged

Cherry-pick 712e23172: fix(agent): forward resolved outbound session context for delivery#1216
alexey-pelykh merged 1 commit intomainfrom
cherry-pick/712e23172-forward-outbound-session-context

Conversation

@alexey-pelykh
Copy link
Copy Markdown

Cherry-pick from upstream

Summary

Forwards the resolved outbound session context from agentCommand to deliverAgentCommandResult, 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:

  • agent.ts: Import conflict (fork uses middleware imports instead of getRemoteSkillEligibility; added buildOutboundSessionContext import alongside fork imports). ACP block conflict (fork gutted the ACP execution path; kept fork's empty block — the outboundSession additions to the two remaining deliverAgentCommandResult call sites auto-merged).
  • agent.test.ts: Fork removed runCliAgentSpy (gutted CLI runner spy); kept only the new deliverAgentCommandResultSpy addition.
  • delivery.ts: Import changed from function to type-only (OutboundSessionContext); kept fork's AgentDeliveryResult import. Destructuring merged: added outboundSession to params destructuring while preserving fork's resultMeta block.

Cherry-picked-from: 712e231

@alexey-pelykh alexey-pelykh merged commit f79a60c into main Mar 13, 2026
7 checks passed
@alexey-pelykh alexey-pelykh deleted the cherry-pick/712e23172-forward-outbound-session-context branch March 13, 2026 17:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants