fix: attempting to resume an existing conversation in ConversationManager should reuse it #5657
+73
−10
Conversation
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
…ager should reuse it
|
@codex please review |
bolinfest
commented
Oct 24, 2025
| } = Codex::spawn(config, auth_manager, initial_history, self.session_source).await?; | ||
| self.finalize_spawn(codex, conversation_id).await | ||
| if let InitialHistory::Resumed(resumed) = &initial_history | ||
| && let Some(existing) = self |
There was a problem hiding this comment.
Hmm, I don't love that we do the read() here and on that basis do the write() later, as that means there is still time between these two events for the conversation to be inserted twice?
|
Codex Review: Didn't find any major issues. Keep them coming! ℹ️ 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". |
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.
Prior to this change,
spawn_conversation()would callfinalize_spawn():codex/codex-rs/core/src/conversation_manager.rs
Line 79 in 6af83d8
which would then categorically insert the conversation into
self.conversations:codex/codex-rs/core/src/conversation_manager.rs
Lines 102 to 105 in 6af83d8
but this is potentially problematic because the resuming the same conversation could potentially be requested multiple times over the lifetime of the app server.
This updates the business logic to return the existing conversation, if appropriate.