Fix stale call-site arguments after merge conflict resolution in messageStream.js - #233
Merged
Merged
Conversation
Co-authored-by: ruoyuwang1995nya <53182543+ruoyuwang1995nya@users.noreply.github.com>
Copilot
AI
changed the title
fix(web): restore correct pollCancellationConfirmed argument in stop()
Fix stale call-site arguments after merge conflict resolution in messageStream.js
Aug 14, 2026
Copilot created this pull request from a session on behalf of
ruoyuwang1995nya
August 14, 2026 12:33
View session
ruoyuwang1995nya
approved these changes
Aug 14, 2026
ruoyuwang1995nya
marked this pull request as ready for review
August 14, 2026 12:44
ruoyuwang1995nya
added a commit
that referenced
this pull request
Aug 14, 2026
Fix remaining web merge regressions in PR #233
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.
Manual conflict resolution in commit
b47995a("Merge branch 'devel' into devel") adopted the newpollCancellationConfirmed(request, attempts = 0)signature but left one call site on the old two-argument form, breaking the stop/cancel data flow.stop()call site: updated to pass therequestobject instead of its destructured fields.With the old call,
request.sessionId(a string) was bound to therequestparameter andrequest.ownertoattempts. Every internal access torequest.runId/request.sessionIdinsidepollCancellationConfirmedthen resolved toundefined, and the mismatched object reachedreleaseSessionRequest, so the entry instate.activeRequestswas never cleared — leaving the UI stuck reporting a session as still running after Stop was clicked.This aligns the
stop()call with the other three call sites in the file, which already use the single-argument form.