* Harden interrupted recovery control filtering * Redesign live-to-final assistant replies * Fix live activity anchor test fixture * Fix CI lint issues for live reply tests * Strengthen live progress prompt contract * Recover PR #3401 refresh on origin/master * Repair live-to-final refresh regressions * Fix live worklog refresh regressions * Show live footer timer on initial stream start * Restore live stream shell after reload * Preserve per-frame live SSE replay cursors * Preserve reasoning as Worklog Thinking cards * Quiet Worklog Thinking card styling * Align Worklog Thinking card styling * Scope live Worklog Thinking cards by segment * Suppress exact duplicate settled Thinking * Close #3401 merge review test gaps * fix(#3401): resolve 4 deep-review regressions (inline-think, reconnect-dup, neon skin, busy-gate worklog) Deep review (Codex diff-vs-master + live-browser drive) of the live-to-final refactor surfaced 4 regressions vs master that the rewritten suite no longer guarded: 1. Inline <think>…</think>answer reasoning vanished — _assistantReasoningPayloadText used $-anchored regexes so a leading think block + visible answer extracted nothing and the Thinking card never rendered. Removed the 3 $ anchors to match the (non-anchored) display stripper. Live: inline-think thinking-only turn now renders. 2. (CORE) reconnect/reload duplicated the live reply — _rememberRunJournalCursor advanced a closure-local seq but never wrote INFLIGHT[activeSid].lastRunJournalSeq, so a reload replayed the journal from after_seq=0 over restored lastAssistantText. Now mirrors the cursor onto INFLIGHT + schedules a throttled persist. 3. Neon skin silently broke — PR deleted the :root[data-skin="neon"] CSS but left Neon in the picker. Restored the neon CSS block from master. 4. Settled tool-worklog rebuild gated purely on !S.busy — dropped every prior settled turn's worklog when renderMessages re-ran during an active stream (switch-back to an in-progress session). Restored master's !S.busy || (S.toolCalls && S.toolCalls.length). Live: busy re-render now preserves tool cards (4→4, was 4→0). Live-verified all 4 + confirmed #3709/#3592 invariants still hold (1 thinking card, none below footer; distinct siblings preserved). + tests/test_issue3401_deep_review_fixes.py (7). * test(#3401): realign 3 stale source-shape assertions to the deep-review fixes Fix commit changed two source literals that existing stage tests scanned for: - test_live_activity_timeline.py (x2): split anchor 'if(!S.busy){' → the restored 'if(!S.busy || (S.toolCalls&&S.toolCalls.length)){' guard (fix 4). - test_run_journal_frontend_static.py: 'after_seq=0' not in source — fix 2's comment contained that literal; rephrased the comment to 'the zero floor (after_seq of 0)'. Intent of all three assertions unchanged; only the matched string updated. No code behavior change. * docs(changelog): v0.51.294 — Release JJ (stage-3401, #3401 live-to-final redesign) --------- Co-authored-by: Frank Song <franksong2702@gmail.com> Co-authored-by: Nathan-Hermes <nesquena-hermes@users.noreply.github.com> Co-authored-by: nesquena-hermes <[email protected]>
112 lines
4.9 KiB
Python
112 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)" 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
|