* fix(streaming): show new-message cue when preserving scroll position (#3545) # Conflicts: # static/ui.js # tests/test_issue1690_scroll_completion.py # tests/test_tars_scroll_reset_regressions.py * i18n: add missing Polish (pl) translation for session_new_message keys The PR added session_new_message / session_new_message_label to 12 of 13 locales; Polish was missing both, which fails the per-locale parity test. Co-authored-by: rodboev <rodboev@users.noreply.github.com> * fix(streaming): keep forced follow path for pinned users in preserve-scroll branch Codex CORE catch: the PR's preserve-scroll branch used 'if(_scrollPinned) scrollIfPinned()' which skips the synchronous bottom write unless distance>500 and can have its delayed settles cancelled by the DOM-rebuild scroll event — leaving a pinned reader a few lines above the settled final response. Restore master's _followMessagesAfterDomReplace() forced-scrollToBottom() path for pinned/near-bottom users; only genuinely scrolled-up (unpinned, not near bottom) users restore their viewport and get the new-message cue. Updated the 3 structure-pinning tests to assert the corrected (safer) shape while preserving their behavioral intent. Co-authored-by: rodboev <rodboev@users.noreply.github.com> * Release v0.51.334 — Release KX (new-message cue when scrolled up, #3631) New-message cue on the jump-to-bottom button when the user has scrolled up during a live turn (#3545/#3631, @rodboev). Deep-reviewed (Opus+Codex); maintainer fixes during re-gate: (1) restored master's forced follow path for pinned/near-bottom users (Codex CORE: scrollIfPinned could leave a pinned reader short of the settled response) + updated 3 structure-pinning tests to the corrected shape; (2) added missing Polish (pl) i18n keys (PR had 12/13). Full suite 8308, ESLint/scope-undef CLEAN, Opus SHIP-safe, Codex SAFE-TO-SHIP. Co-authored-by: rodboev <rodboev@users.noreply.github.com> --------- Co-authored-by: Rod Boev <rod.boev@gmail.com> Co-authored-by: Hermes Agent <hermes-agent@nesquena-hermes.local> Co-authored-by: rodboev <rodboev@users.noreply.github.com>
111 lines
4.9 KiB
Python
111 lines
4.9 KiB
Python
from pathlib import Path
|
|
|
|
REPO = Path(__file__).resolve().parents[1]
|
|
UI_JS = (REPO / "static" / "ui.js").read_text(encoding="utf-8")
|
|
SESSIONS_JS = (REPO / "static" / "sessions.js").read_text(encoding="utf-8")
|
|
|
|
|
|
def _function_body(src: str, signature: str) -> str:
|
|
start = src.index(signature)
|
|
brace = src.index("{", start)
|
|
depth = 0
|
|
for i in range(brace, len(src)):
|
|
if src[i] == "{":
|
|
depth += 1
|
|
elif src[i] == "}":
|
|
depth -= 1
|
|
if depth == 0:
|
|
return src[start : i + 1]
|
|
raise AssertionError(f"function body not found: {signature}")
|
|
|
|
|
|
def _scroll_listener_block() -> str:
|
|
start = UI_JS.index("el.addEventListener('scroll'")
|
|
return UI_JS[start : UI_JS.index("})();", start)]
|
|
|
|
|
|
def test_clicking_current_session_is_noop_before_load_session_side_effects():
|
|
load_session = _function_body(SESSIONS_JS, "async function loadSession")
|
|
|
|
current_idx = load_session.index("const currentSid = S.session ? S.session.session_id : null")
|
|
noop_idx = load_session.index("if(currentSid===sid && !forceReload) return")
|
|
loading_idx = load_session.index("_loadingSessionId = sid")
|
|
stop_idx = load_session.index("stopApprovalPolling")
|
|
|
|
assert current_idx < noop_idx < loading_idx < stop_idx, (
|
|
"clicking the already-open sidebar row must be a no-op before loadSession() "
|
|
"mutates loading/runtime state or scroll-affecting UI"
|
|
)
|
|
|
|
|
|
def test_scroll_to_bottom_settles_across_late_markdown_layout_growth():
|
|
settle = _function_body(UI_JS, "function _settleMessageScrollToBottom")
|
|
scroll = _function_body(UI_JS, "function scrollToBottom")
|
|
pinned = _function_body(UI_JS, "function scrollIfPinned")
|
|
|
|
assert "requestAnimationFrame" in settle
|
|
assert "setTimeout" in settle
|
|
assert "const passes=[0,16,80,180]" in settle
|
|
assert "_settleMessageScrollToBottom(true)" in scroll
|
|
assert "_settleMessageScrollToBottom(false)" in pinned
|
|
assert "!_scrollPinned" in settle
|
|
assert "const token=++_bottomSettleToken" in settle
|
|
assert "token!==_bottomSettleToken" in settle
|
|
|
|
|
|
def test_scroll_to_bottom_writes_scroll_position_immediately_before_delayed_settle():
|
|
scroll = _function_body(UI_JS, "function scrollToBottom")
|
|
|
|
immediate_idx = scroll.index("_setMessageScrollToBottom();")
|
|
settle_idx = scroll.index("_settleMessageScrollToBottom(true)")
|
|
|
|
assert immediate_idx < settle_idx, (
|
|
"scrollToBottom() must write scrollTop synchronously before scheduling delayed settles; "
|
|
"otherwise a DOM-rebuild scroll event can cancel the delayed passes and strand the viewport at the top"
|
|
)
|
|
|
|
|
|
def test_message_scroll_listener_does_not_downgrade_explicit_bottom_pin_on_first_near_bottom_event():
|
|
listener_block = _scroll_listener_block()
|
|
set_bottom = _function_body(UI_JS, "function _setMessageScrollToBottom")
|
|
|
|
assert "_nearBottomCount=2" in set_bottom
|
|
assert "_scrollPinned=_nearBottomCount>=2" not in listener_block
|
|
assert "if(_nearBottomCount>=2) _scrollPinned=true" in listener_block
|
|
assert "_scrollPinned=false" in listener_block
|
|
|
|
|
|
def test_user_scroll_cancels_delayed_bottom_settling():
|
|
listener_block = _scroll_listener_block()
|
|
record = _function_body(UI_JS, "function _recordNonMessageScrollIntent")
|
|
pinned = _function_body(UI_JS, "function scrollIfPinned")
|
|
|
|
assert "function _cancelBottomSettle" in UI_JS
|
|
assert "_cancelBottomSettle();" in listener_block
|
|
assert "e.deltaY<0" in record
|
|
assert "_cancelBottomSettle();" in record
|
|
assert "_scrollPinned=false" in record
|
|
assert "if(_messageUserUnpinned) return;" in pinned
|
|
assert "_recentMessageUpwardIntent()" not in pinned
|
|
|
|
|
|
def test_preserve_scroll_restores_unpinned_viewport_after_dom_rebuild():
|
|
render = _function_body(UI_JS, "function renderMessages")
|
|
after_render = _function_body(UI_JS, "function _scrollAfterMessageRender")
|
|
follow = _function_body(UI_JS, "function _followMessagesAfterDomReplace")
|
|
restore = _function_body(UI_JS, "function _restoreMessageScrollSnapshot")
|
|
|
|
snapshot_idx = render.index("const scrollSnapshot=preserveScroll?_captureMessageScrollSnapshot():null")
|
|
inner_idx = render.index("const inner=$('msgInner')")
|
|
final_scroll_idx = render.rindex("_scrollAfterMessageRender(preserveScroll, scrollSnapshot)")
|
|
|
|
assert snapshot_idx < inner_idx < final_scroll_idx, (
|
|
"renderMessages({preserveScroll:true}) must capture #messages.scrollTop before "
|
|
"replacing transcript DOM, then pass that snapshot to the post-render scroll helper"
|
|
)
|
|
assert "if(_followMessagesAfterDomReplace()) return;" in after_render
|
|
assert "_restoreMessageScrollSnapshot(scrollSnapshot);\n _maybeShowNewMessageScrollCue(scrollSnapshot);" in after_render
|
|
assert "_shouldFollowMessagesOnDomReplace()" in follow
|
|
assert "scrollToBottom();" in follow
|
|
assert "el.scrollTop=Math.max(0,Math.min(Number(snapshot.top)||0,maxTop))" in restore
|
|
assert "_programmaticScroll=true" in restore
|