Skip to content

Fix stale call-site arguments after merge conflict resolution in messageStream.js - #233

Merged
ruoyuwang1995nya merged 1 commit into
develfrom
copilot/check-merge-conflict-web-src
Aug 14, 2026
Merged

Fix stale call-site arguments after merge conflict resolution in messageStream.js#233
ruoyuwang1995nya merged 1 commit into
develfrom
copilot/check-merge-conflict-web-src

Conversation

Copilot AI commented Aug 14, 2026

Copy link
Copy Markdown
Contributor

Manual conflict resolution in commit b47995a ("Merge branch 'devel' into devel") adopted the new pollCancellationConfirmed(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 the request object instead of its destructured fields.
// before
pollCancellationConfirmed(request.sessionId, request.owner);

// after
void pollCancellationConfirmed(request);

With the old call, request.sessionId (a string) was bound to the request parameter and request.owner to attempts. Every internal access to request.runId / request.sessionId inside pollCancellationConfirmed then resolved to undefined, and the mismatched object reached releaseSessionRequest, so the entry in state.activeRequests was 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.

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 AI requested a review from ruoyuwang1995nya August 14, 2026 12:33
@ruoyuwang1995nya
ruoyuwang1995nya marked this pull request as ready for review August 14, 2026 12:44
@ruoyuwang1995nya
ruoyuwang1995nya merged commit 59b29f7 into devel Aug 14, 2026
1 check passed
ruoyuwang1995nya added a commit that referenced this pull request Aug 14, 2026
Fix remaining web merge regressions in PR #233
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants