David/HERMES-GIELIE
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: queue pinned live scroll ownership check

Browse source
This commit is contained in:
Frank Song 2026-07-25 16:30:20 +08:00
parent c32b10ee8b
commit fd1879418d
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
static/ui.js
View file

@ -12726,13 +12726,20 @@ function _prepareLiveAnchorScrollRebuildGuard(scrollSnapshot){
};
}
function _restoreLiveAnchorScrollSnapshotAfterRebuild(scrollSnapshot, scrollRebuildGuard){
if(!scrollRebuildGuard||!scrollRebuildGuard.release) return;
if(!scrollSnapshot) return;
const hasHeightGuard=!!(scrollRebuildGuard&&scrollRebuildGuard.release);
// Pinned renders have no height guard to release, but still need the same
// queued ownership check: a reader can provide real input before the frame
// settles, and that input must win over the captured tail position.
if(!hasHeightGuard&&scrollSnapshot.pinned!==true) return;
requestAnimationFrame(()=>{
scrollRebuildGuard.release();
if(hasHeightGuard) scrollRebuildGuard.release();
// Only re-restore the unpinned snapshot if the reader is STILL unpinned at
// rAF time. If they re-pinned between guard-engage and this frame, the
// stale re-restore would yank them back off the bottom (Opus gate finding).
if(_messageUserUnpinned) _restoreMessageScrollSnapshotSameFrame(scrollSnapshot);
if(scrollSnapshot.pinned===true||_messageUserUnpinned){
_restoreMessageScrollSnapshotSameFrame(scrollSnapshot);
}
});
}
function _resetMismatchedLiveAssistantTurnForSession(turn, sessionId){

9
tests/test_issue5637_stale_anchor_guard.py
View file

@ -135,6 +135,7 @@ let _lastScrollTop=null, _lastMessageClientHeight=null;
let _programmaticScroll=false, _programmaticScrollSetAt=0;
let recordWrites=true;
const callbacks=[];
let delayedSnapshotPinned=null;
const performance={{now(){{return 1;}}}};
const el={{
scrollHeight:90453, clientHeight:427,
@ -158,21 +159,21 @@ function _isTouchLikeMessageViewport(){{return false;}}
function _recentMessageScrollIntent(){{return false;}}
function _recentMessageTouchScrollIntent(){{return false;}}
function _restoreMessageScrollSnapshotSameFrameFallback(){{}}
function requestAnimationFrame(callback){{callbacks.push(callback);}}
function requestAnimationFrame(callback){{callbacks.push(()=>{{delayedSnapshotPinned=snapshot.pinned===true; callback();}});}}
const snapshot=_captureMessageScrollSnapshot();
const capturedPinned=snapshot.pinned===true;
{"el._top=89577; _messageUserUnpinned=true; _scrollPinned=false;" if not move_to_bottom else ""}
const scrollRebuildGuard=_prepareLiveAnchorScrollRebuildGuard(snapshot);
_restoreMessageScrollSnapshotSameFrame(snapshot);
const initialWrites=writes.slice();
writes=[];
_restoreLiveAnchorScrollSnapshotAfterRebuild(snapshot,scrollRebuildGuard);
const guardQueued=callbacks.length>0;
recordWrites=false;
_recordNonMessageScrollIntent({{target:el,deltaY:{target_delta}}});
el.scrollTop={final_top};
recordWrites=true;
callbacks.shift()();
console.log(JSON.stringify({{capturedPinned,guardQueued:!!(scrollRebuildGuard&&scrollRebuildGuard.release),initialWrites,writes, finalScrollTop:el.scrollTop,
console.log(JSON.stringify({{capturedPinned,guardQueued,delayedSnapshotPinned,initialWrites,writes, finalScrollTop:el.scrollTop,
messageUserUnpinned:_messageUserUnpinned, scrollPinned:_scrollPinned,
generation:_messageScrollInputGeneration}}));
"""
@ -184,6 +185,7 @@ def test_live_render_queue_preserves_real_upward_input_from_pinned_capture():
assert result == {
"capturedPinned": True,
"guardQueued": True,
"delayedSnapshotPinned": True,
"initialWrites": [90026],
"writes": [],
"finalScrollTop": 89000,
@ -199,6 +201,7 @@ def test_live_render_queue_repins_real_downward_input_at_bottom():
assert result == {
"capturedPinned": False,
"guardQueued": True,
"delayedSnapshotPinned": False,
"initialWrites": [89577],
"writes": [],
"finalScrollTop": 90026,