Merged
Conversation
Contributor
|
All contributors have signed the CLA ✍️ ✅ |
pakrym-oai
approved these changes
Feb 6, 2026
pakrym-oai
reviewed
Feb 6, 2026
pakrym-oai
reviewed
Feb 6, 2026
codex-rs/core/src/client.rs
Outdated
| if needs_new { | ||
| let headers = | ||
| self.websocket_last_items.clear(); | ||
| if let Ok(mut last_response_id) = self.websocket_last_response_id.lock() { |
pakrym-oai
reviewed
Feb 6, 2026
pakrym-oai
reviewed
Feb 6, 2026
codex-rs/core/src/client.rs
Outdated
| client: ModelClient, | ||
| connection: Option<ApiWebSocketConnection>, | ||
| websocket_last_items: Vec<ResponseItem>, | ||
| websocket_last_response_id: Arc<std::sync::Mutex<Option<String>>>, |
Collaborator
There was a problem hiding this comment.
this feels like an overkill. ModelClientSession isn't shared across threads. Does Option work here?
Contributor
Author
There was a problem hiding this comment.
looks like the callback that scans the result stream and sees the completed event doesn't have a mutable reference to the ModelClientSession -- removed the old Arc<Mutex<_>> and switched to a per-request oneshot sender/receiver, which should be lighter and also prevents stale late completions from older streams from overwriting newer state
pakrym-oai
reviewed
Feb 6, 2026
Contributor
Author
|
I have read the CLA Document and I hereby sign the CLA |
88cb71f to
2c14f77
Compare
Co-authored-by: Codex Codex changes Co-authored-by: Codex fix rm unnecessary
bf01657 to
13bc164
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Test plan