Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions static/sessions.js
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,7 @@ async function loadSession(sid){
if(!Array.isArray(messages)) return false;
const pendingMsg=typeof getPendingSessionMessage==='function'?getPendingSessionMessage(session,messages):null;
if(!pendingMsg) return false;
if(messages.some(existing=>_sameTranscriptMessage(existing,pendingMsg))) return false;
const liveAssistantIdx=messages.findIndex(m=>m&&m.role==='assistant'&&m._live);
if(liveAssistantIdx>=0) messages.splice(liveAssistantIdx,0,pendingMsg);
else messages.push(pendingMsg);
Expand Down
6 changes: 6 additions & 0 deletions tests/test_regressions.py
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,12 @@ def test_inflight_merge_dedupes_uploaded_user_message(cleanup_test_sessions):
assert "role==='user'" in src, (
"attached-files normalization should be limited to user turns"
)
pending_idx = src.find("function _mergePendingSessionMessage")
assert pending_idx >= 0, "pending session merge helper not found"
pending_block = src[pending_idx:pending_idx+500]
assert "_sameTranscriptMessage(existing,pendingMsg)" in pending_block, (
"pending-user merge should reuse transcript identity dedupe before inserting the server pending message"
)


def test_loadSession_inflight_sets_active_stream_before_replaying_live_tool_cards(cleanup_test_sessions):
Expand Down
Loading