* 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>
89 lines
4.3 KiB
Python
89 lines
4.3 KiB
Python
from pathlib import Path
|
|
|
|
REPO = Path(__file__).resolve().parents[1]
|
|
UI_JS = (REPO / "static" / "ui.js").read_text(encoding="utf-8")
|
|
MESSAGES_JS = (REPO / "static" / "messages.js").read_text(encoding="utf-8")
|
|
SESSIONS_JS = (REPO / "static" / "sessions.js").read_text(encoding="utf-8")
|
|
|
|
|
|
def _function_body(src: str, name: str) -> str:
|
|
start = src.index(f"function {name}")
|
|
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 {name} body not found")
|
|
|
|
|
|
def _event_listener_body(src: str, event_name: str) -> str:
|
|
needle = f"source.addEventListener('{event_name}'"
|
|
start = src.index(needle)
|
|
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"event listener {event_name!r} body not found")
|
|
|
|
|
|
def test_terminal_done_render_preserves_manual_scroll_after_active_stream_is_cleared():
|
|
done_block = _event_listener_body(MESSAGES_JS, "done")
|
|
|
|
clear_idx = done_block.index("S.activeStreamId=null")
|
|
render_idx = done_block.index("renderMessages({preserveScroll:true})")
|
|
|
|
assert clear_idx < render_idx, (
|
|
"the done handler should clear stream liveness before the final render, "
|
|
"but must pass preserveScroll so renderMessages does not infer bottom-pin "
|
|
"from S.activeStreamId alone"
|
|
)
|
|
|
|
|
|
def test_render_messages_preserve_scroll_option_uses_user_pin_state_not_stream_liveness():
|
|
render_body = _function_body(UI_JS, "renderMessages")
|
|
scroll_helper = _function_body(UI_JS, "_scrollAfterMessageRender")
|
|
follow_helper = _function_body(UI_JS, "_followMessagesAfterDomReplace")
|
|
|
|
assert "function renderMessages(options)" in render_body
|
|
assert "const preserveScroll=!!(options&&options.preserveScroll);" in render_body
|
|
assert "_scrollAfterMessageRender(preserveScroll, scrollSnapshot);" in render_body
|
|
assert "const scrollSnapshot=preserveScroll?_captureMessageScrollSnapshot():null" in render_body
|
|
assert "if(preserveScroll){\n // Keep master's follow heuristic" in scroll_helper
|
|
assert "if(_followMessagesAfterDomReplace()) return;\n _restoreMessageScrollSnapshot(scrollSnapshot);\n _maybeShowNewMessageScrollCue(scrollSnapshot);\n return;\n }" in scroll_helper
|
|
assert "_shouldFollowMessagesOnDomReplace()" in follow_helper
|
|
assert "scrollToBottom();" in follow_helper
|
|
assert "if(S.activeStreamId){\n scrollIfPinned();\n return;\n }" in scroll_helper
|
|
|
|
|
|
def test_cached_render_path_uses_same_scroll_policy_as_fresh_render():
|
|
render_body = _function_body(UI_JS, "renderMessages")
|
|
cached_branch = render_body[render_body.index("if(sid&&sid!==_sessionHtmlCacheSid") : render_body.index("const compressionState=")]
|
|
|
|
assert "_scrollAfterMessageRender(preserveScroll, scrollSnapshot);" in cached_branch
|
|
assert "if(S.activeStreamId){scrollIfPinned();}else{scrollToBottom();}" not in cached_branch
|
|
|
|
|
|
def test_session_switch_and_idle_session_load_keep_default_bottom_pin_behavior():
|
|
load_session = _function_body(SESSIONS_JS, "loadSession")
|
|
idle_branch = load_session[load_session.index("}else{\n S.busy=false;") : load_session.index("// Sync context usage indicator")]
|
|
|
|
# #3326: the idle branch now renders with a CONDITIONAL preserveScroll —
|
|
# `renderMessages(sameSessionForceReload?{preserveScroll:true}:undefined)`.
|
|
# For a normal cross-session idle load (currentSid!==sid) sameSessionForceReload
|
|
# is false, so the arg is undefined and the default bottom-pin behavior (#1690)
|
|
# is unchanged. preserveScroll only applies to a same-session external
|
|
# force-refresh (#3239), which is a different code path from #1690's scenario.
|
|
assert "syncTopbar();renderMessages(sameSessionForceReload?{preserveScroll:true}:undefined);" in idle_branch
|
|
# The idle path must NOT unconditionally preserveScroll — it stays bottom-pinned
|
|
# for cross-session loads. Guard against a regression to an always-on preserve.
|
|
assert "renderMessages({preserveScroll:true})" not in idle_branch
|