feat(core): emit canonical collab wait items - #31301
Merged
Merged
Conversation
This was referenced Jul 6, 2026
owenlin0
force-pushed
the
owen/canonical-collab-tool-call-items
branch
from
July 7, 2026 03:51
f1ba3de to
fb2e419
Compare
owenlin0
force-pushed
the
owen/canonical-collab-wait-items
branch
from
July 7, 2026 03:51
bf2b1c2 to
da514c1
Compare
owenlin0
force-pushed
the
owen/canonical-collab-tool-call-items
branch
from
July 7, 2026 03:54
fb2e419 to
7744a91
Compare
owenlin0
force-pushed
the
owen/canonical-collab-wait-items
branch
2 times, most recently
from
July 7, 2026 15:38
1180dde to
abdc820
Compare
owenlin0
force-pushed
the
owen/canonical-collab-tool-call-items
branch
from
July 7, 2026 15:38
7744a91 to
760638f
Compare
owenlin0
marked this pull request as ready for review
July 7, 2026 15:40
pakrym-oai
approved these changes
Jul 7, 2026
owenlin0
force-pushed
the
owen/canonical-collab-tool-call-items
branch
from
July 7, 2026 20:05
760638f to
a4f6c62
Compare
owenlin0
force-pushed
the
owen/canonical-collab-wait-items
branch
3 times, most recently
from
July 7, 2026 20:21
2b0d949 to
0a7db2f
Compare
owenlin0
force-pushed
the
owen/canonical-collab-wait-items
branch
from
July 7, 2026 20:39
0a7db2f to
252ff86
Compare
owenlin0
enabled auto-merge (squash)
July 7, 2026 20:47
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR depends on #31296 for the canonical-to-legacy event mappings.
Description
This PR makes the v1 and v2 wait paths emit canonical
TurnItem::CollabAgentToolCalllifecycle instead ofCollabWaitingBegin/CollabWaitingEnddirectly.Both paths already used the same legacy waiting events before this PR. The v1 item carries receiver metadata and final agent statuses for its target agents; v2 waits for mailbox activity rather than specific agents, so it keeps those fields empty, matching the existing v2 legacy payload.
App-server v2 consumes the canonical item directly and ignores the mapped legacy wait events.
Why
Wait is separate from the other collab tools because it is multi-target and has distinct timeout/status behavior. Keeping it last also lets this PR remove the old helper that only existed to shape legacy wait status entries in core.
What changed
Follow-up
The next stack PR, #30188, writes canonical
TurnItemvalues to paginated rollout files.