Enable handoff for orchestrating (or orchestrated) agents#11768
Merged
harryalbert merged 5 commits intoJun 1, 2026
Merged
Conversation
95ad624 to
e2fb33a
Compare
Contributor
|
I'm starting a first review of this pull request. You can view the conversation on Warp. I completed the review and no human review was requested for this pull request. Comment Powered by Oz |
Contributor
There was a problem hiding this comment.
Overview
This PR re-enables local-to-cloud handoff for orchestration conversations, adds a minimal orchestration_handoff marker to local handoff spawn requests, and includes focused request serialization/propagation coverage.
Concerns
- No blocking correctness, security, or spec-alignment concerns found in the annotated diff.
Verdict
Found: 0 critical, 0 important, 0 suggestions
Approve
Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).
Powered by Oz
e2fb33a to
38faf41
Compare
cephalonaut
approved these changes
Jun 1, 2026
38faf41 to
2eed094
Compare
2eed094 to
0ddc560
Compare
0ddc560 to
4f3acf2
Compare
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.

Description
We specifically disabled handoff for orchestrated/orchestrating agents because there were some weird interaction patterns where the cloud agent wouldn't understand that it moved environments and would try to communicate with its old parent/children.
The fix for this is some conditional prompting on the server (added in this PR) which we include whenever the client indicates in its handoff request that the conversation it is handing off was an orchestration conversation.
This PR adds in that indication and also re-enables handoff for orchestration conversations.
Testing
./script/runScreenshots / Videos
https://www.loom.com/share/b0b91f0d71a44cc0ad4a490a327b20b5
Changelog Entries for Stable
CHANGELOG-IMPROVEMENT: Enabled handoff for locally orchestrated conversations.
Agent Mode