Fix history loading race condition in ThreadManager#1853
Merged
Conversation
Bug 1: Replace single pendingHistoryThreadId with a dictionary keyed by sessionId so rapid tab switches don't route history from Thread A into Thread B. Add sessionId to the daemon's history_response payload so the client can correlate responses back to the correct thread. Bug 2: Guard populateFromHistory against overwriting live messages — skip replacement if the thread already has user-sent messages. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 132fec26ed
ℹ️ About Codex in GitHub
Codex has been enabled to automatically 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 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
ashleeradka
added a commit
that referenced
this pull request
Feb 14, 2026
- Resolved modify/delete conflict with IPCMessages.swift (file moved to shared/) - Ported sessionId field to HistoryResponseMessage from main (#1853) - Auto-merged changes to ChatViewModel, ThreadManager, and other macOS files Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Contributor
Author
|
Addressed in #1903 |
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
Addresses review feedback on #1814:
Race condition fix: Replaced single
pendingHistoryThreadIdwith apendingHistoryBySessionIddictionary, and addedsessionIdto the daemon'shistory_responsepayload. This ensures rapid tab switching doesn't route history from one thread into another — each in-flight request is correlated by session ID.Overwrite guard:
populateFromHistorynow skips replacing messages if the thread already contains user-sent messages, preventing a latehistory_responsefrom clobbering live conversation.Changed files
assistant/src/daemon/ipc-protocol.ts— addedsessionIdtoHistoryResponseassistant/src/daemon/handlers.ts— echosessionIdback in responseclients/macos/.../IPCMessages.swift— addedsessionIdtoHistoryResponseMessageclients/macos/.../ThreadManager.swift— dictionary-based pending trackingclients/macos/.../ChatViewModel.swift— guard against overwriting live messagesassistant/src/__tests__/ipc-snapshot.test.ts+ snapshot — updated test fixtureTest plan