Skip to content

Enable handoff for orchestrating (or orchestrated) agents#11768

Merged
harryalbert merged 5 commits into
masterfrom
harry/app-4579-support-handoff-for-orchestrators-and-orchestrated-agents-or
Jun 1, 2026
Merged

Enable handoff for orchestrating (or orchestrated) agents#11768
harryalbert merged 5 commits into
masterfrom
harry/app-4579-support-handoff-for-orchestrators-and-orchestrated-agents-or

Conversation

@harryalbert
Copy link
Copy Markdown
Contributor

@harryalbert harryalbert commented May 27, 2026

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

  • I have manually tested my changes locally with ./script/run

Screenshots / Videos

https://www.loom.com/share/b0b91f0d71a44cc0ad4a490a327b20b5

Changelog Entries for Stable

CHANGELOG-IMPROVEMENT: Enabled handoff for locally orchestrated conversations.

Agent Mode

  • Warp Agent Mode - This PR was created via Warp's AI Agent Mode

@cla-bot cla-bot Bot added the cla-signed label May 27, 2026
Copy link
Copy Markdown
Contributor Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

@harryalbert harryalbert force-pushed the harry/app-4579-support-handoff-for-orchestrators-and-orchestrated-agents-or branch from 95ad624 to e2fb33a Compare May 27, 2026 18:55
@harryalbert harryalbert changed the title add product and tech spec Allow handoff for orchestrating (or orchestrated) agents May 27, 2026
@harryalbert harryalbert changed the title Allow handoff for orchestrating (or orchestrated) agents Enable handoff for orchestrating (or orchestrated) agents May 27, 2026
@harryalbert harryalbert marked this pull request as ready for review May 27, 2026 19:04
@oz-for-oss
Copy link
Copy Markdown
Contributor

oz-for-oss Bot commented May 27, 2026

@harryalbert

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 /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

Copy link
Copy Markdown
Contributor

@oz-for-oss oz-for-oss Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@harryalbert harryalbert removed the request for review from captainsafia May 28, 2026 19:08
@harryalbert harryalbert force-pushed the harry/app-4579-support-handoff-for-orchestrators-and-orchestrated-agents-or branch from e2fb33a to 38faf41 Compare May 28, 2026 19:19
@harryalbert harryalbert force-pushed the harry/app-4579-support-handoff-for-orchestrators-and-orchestrated-agents-or branch from 38faf41 to 2eed094 Compare June 1, 2026 14:32
@harryalbert harryalbert enabled auto-merge (squash) June 1, 2026 14:35
@harryalbert harryalbert force-pushed the harry/app-4579-support-handoff-for-orchestrators-and-orchestrated-agents-or branch from 2eed094 to 0ddc560 Compare June 1, 2026 15:13
@harryalbert harryalbert force-pushed the harry/app-4579-support-handoff-for-orchestrators-and-orchestrated-agents-or branch from 0ddc560 to 4f3acf2 Compare June 1, 2026 15:47
@harryalbert harryalbert merged commit 52a708b into master Jun 1, 2026
26 checks passed
@harryalbert harryalbert deleted the harry/app-4579-support-handoff-for-orchestrators-and-orchestrated-agents-or branch June 1, 2026 16:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants