fix(tui): preserve live parts during session hydration#30300
Merged
Conversation
Contributor
Author
|
/review |
| }), | ||
| ) | ||
| break | ||
| } |
Contributor
There was a problem hiding this comment.
Suggestion: consider only calling touchPart after this delta is actually applied. Right now a delta for a part that is not in local state still marks the part as live, then the hydration merge treats the HTTP snapshot as stale and drops it because there is no current part to preserve. Moving the revision touch below the !parts / !result.found guards would keep discarded deltas from deleting the hydrated part.
ShamirSecret
pushed a commit
to ShamirSecret/auto-code-machine
that referenced
this pull request
Jun 2, 2026
0xLLLLH
pushed a commit
to 0xLLLLH/opencode
that referenced
this pull request
Jun 2, 2026
ShamirSecret
pushed a commit
to ShamirSecret/auto-code-machine
that referenced
this pull request
Jun 3, 2026
(cherry picked from commit 1cae8f8)
avion23
pushed a commit
to avion23/opencode
that referenced
this pull request
Jun 10, 2026
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
Root Cause
SyncProvider.session.sync()fetched session history asynchronously and then replacedmessage/partstate wholesale. If a livemessage.part.updatedevent arrived before that response completed, the older response could overwrite visible assistant text with stale content until a later reload.This is an independently reproduced TUI data race; it does not claim to fully explain or fix the separately observed OpenTUI blank-region report.
Verification
bun run test -- test/cli/cmd/tui/sync-live-hydration.test.tsx test/cli/cmd/tui/sync.test.tsx test/cli/cmd/tui/sync-undefined-messages.test.tsxbun typecheckbunx oxlint packages/opencode/src/cli/cmd/tui/context/sync.tsx packages/opencode/test/cli/cmd/tui/sync-live-hydration.test.tsx(existing warnings insync.tsx, no lint errors)