fix(session): use index-based message ordering and harden prompt loop exit#17256
Open
sjawhar wants to merge 1 commit intoanomalyco:devfrom
Open
fix(session): use index-based message ordering and harden prompt loop exit#17256sjawhar wants to merge 1 commit intoanomalyco:devfrom
sjawhar wants to merge 1 commit intoanomalyco:devfrom
Conversation
… exit Replace lexicographic ID comparisons with position-based lookups in session restore, fork, and timeline queuing to handle clock-skewed message IDs correctly. Add sortMessages utility (time.created → role rank → id) to packages/util for consistent message ordering across frontend and backend. Guard shouldExitLoop against missing parentID — fail-safe to exit rather than loop indefinitely when assistant parentID is undefined. Add skewed-message test fixtures and extend prompt/revert/session test suites for the new ordering logic.
github-actions
bot
added
the
needs:compliance
github-actions
bot
removed
the
needs:compliance
Contributor
|
Thanks for updating your PR! It now meets our contributing guidelines. 👍 |
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.
Issue for this PR
Closes #11863
Type of change
What does this PR do?
When client and server clocks diverge, message IDs don't sort in creation order. Several places in the frontend use
>/>=on IDs to determine message boundaries (restore, fork, timeline queuing), which breaks under clock skew. The prompt loop'sshouldExitLoopalso fails open whenparentIDis undefined.This PR:
findIndex/indexOfon already-sorted arrayssortMessagesutility topackages/util(sort bytime.created→ role rank → id)shouldExitLoopagainst undefinedparentID— exits instead of loopingHow did you verify your code works?
bun typecheckpasses inpackages/opencode,packages/app,packages/utilbun test test/session/prompt.test.ts— 14 pass including new undefined-parentID casebun testinpackages/util— 3 pass including newsortMessagesordering testsskewed-messages.tsfixture with factory helpers for clock-skewed message IDsScreenshots / recordings
N/A — logic change, no UI modifications.
Checklist