Fix: M2 client history paging review feedback#9247
Merged
Conversation
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 5ebc6a0585
ℹ️ 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".
Contributor
Author
|
Addressed in #9327 |
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
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 #9235. Fixes three scenarios where
isLoadingMoreMessagescan get permanently stuck, blocking all future "Load more" history pagination attempts.Implementation
1. Timeout for unresponsive daemon (ChatViewModel.swift)
loadPreviousMessagePage()setsisLoadingMoreMessages = truebefore requesting history from the daemon, but relies onpopulateFromHistoryto clear it. If the daemon drops the connection or never responds, the flag stays true forever. Added a 15-second timeout task that resets the flag if the daemon never responds. The timeout is cancelled whenpopulateFromHistorysuccessfully processes the response.2. Guard failure cleanup on macOS (ThreadSessionRestorer.swift)
When
requestPaginatedHistoryguard forthreadfails (e.g., thread removed during a concurrent reconnect/refresh), the method returned early without resettingisLoadingMoreMessages. Added aexistingChatViewModel(forSessionId:)method to theThreadRestorerDelegateprotocol andThreadManagerimplementation that looks up VMs by iterating thechatViewModelsdictionary, enabling cleanup even when the thread is no longer in the threads array.3. Guard failure cleanup on iOS (IOSThreadStore.swift)
Same pattern as macOS — the compound guard (
daemonClient as? DaemonClient+ thread lookup) could fail without resetting loading state. The daemon cast specifically fails when usingHTTPDaemonClient(remote daemon mode). Added cleanup in the else block that re-attempts the thread lookup (which succeeds when only the daemon cast failed) and resetsisLoadingMoreMessages.Files Changed
clients/shared/Features/Chat/ChatViewModel.swift— Added timeout task property + 15s timeout inloadPreviousMessagePage(), cancel inpopulateFromHistoryclients/macos/vellum-assistant/Features/MainWindow/ThreadSessionRestorer.swift— AddedexistingChatViewModel(forSessionId:)to protocol, guard failure cleanupclients/macos/vellum-assistant/Features/MainWindow/ThreadManager.swift— ImplementedexistingChatViewModel(forSessionId:)with dictionary iterationclients/macos/vellum-assistantTests/ThreadSessionRestorerTests.swift— Added mock implementation of new protocol methodclients/ios/App/IOSThreadStore.swift— Guard failure cleanup with thread re-lookupTesting