fix(flow-chat): preserve explicit session selection during restore#1129
Merged
limityan merged 1 commit intoJun 10, 2026
Merged
Conversation
4462b6e to
0e54cc4
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 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
Fix session restore races where async historical initialization could overwrite a user-selected session or an active workspace after the user had already moved on.
Root cause
FlowChatManager.initializeWorkspace()auto-selected the latest historical session and awaitedloadSessionHistory()before callingswitchSession(). If the user clicked another session during that await, the stale initialization could still switch back to the auto-selected session. A stricter review also found the same class of issue at workspace scope: an older workspace initialization could continue after a newer workspace became active and then write old workspace/session side effects.Changes
AppLayouteffect cleanup guards so stale initialization effects do not create sessions, send pending project descriptions, open pending settings, or show stale errors after workspace changes.user-only-latestE2E fixture scenario so historical sessions whose latest turn has no model response are validated against the latest visible content.Validation
pnpm --dir src/web-ui run test:run src/flow_chat/services/FlowChatManager.test.tspnpm run type-check:webpnpm run check:repo-hygienepnpm run desktop:build:release-fastRisk