-
Notifications
You must be signed in to change notification settings - Fork 7.9k
Queue nudges while plan generating #10457
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
5d8d18d to
7aa0b30
Compare
|
@codex review this |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 7aa0b30a8f
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
|
@codex review this |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 699e77455c
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
699e774 to
953cd45
Compare
|
@codex review this |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 953cd450a2
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
|
@codex review this |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: b530c9285c
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
|
@codex review this |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 804dd148b9
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
|
All contributors have signed the CLA ✍️ ✅ |
7da38d7 to
3c29c56
Compare
|
@codex review this |
|
Codex Review: Didn't find any major issues. Breezy! ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
Summary
This PR fixes a UI/streaming race when nudged or steer-enabled messages are queued during an active Plan stream.
Previously,
submit_user_message_with_modeswitched collaboration mode immediately (viaset_collaboration_mask) even when the message wasqueued. If that happened mid-Plan stream,
active_mode_kindcould flip away from Plan before the turn finished, causing subsequenton_plan_deltaupdates to be ignored in the UI.Now, mode switching is deferred until the queued message is actually submitted.
What changed
UserMessage:collaboration_mode_override: Option<CollaborationModeMask>submit_user_message_with_modeto:UserMessagecarrying the mode overridesubmit_user_messageto:collaboration_mode_overridejust before constructing/sendingOp::UserTurnplan_stream_controller.is_some())Why
This preserves Plan mode for the remainder of the in-flight Plan turn, so streamed plan deltas continue rendering correctly, while still
ensuring the follow-up queued message is sent with the intended collaboration mode.
Behavior after this change
Tests
Added/updated coverage in
tui/src/chatwidget/tests.rs:submit_user_message_with_mode_queues_while_plan_stream_is_activesubmit_user_message_with_mode_submits_when_plan_stream_is_not_activesteer_enter_queues_while_plan_stream_is_activesteer_enter_submits_when_plan_stream_is_not_activeAlso updated existing
UserMessage { ... }test fixtures to include the new field.Codex author
codex fork 019c1047-d5d5-7c92-a357-6009604dc7e8