From ac66c9093ff6bfbcd4d2ade29cc18193a779e194 Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Thu, 14 May 2026 08:35:30 -0600 Subject: [PATCH 001/349] Improve mobile session list actions --- static/sessions.js | 163 +++++++++++++++++++++++++--- static/style.css | 17 ++- tests/test_session_touch_actions.py | 78 +++++++++++++ 3 files changed, 237 insertions(+), 21 deletions(-) create mode 100644 tests/test_session_touch_actions.py diff --git a/static/sessions.js b/static/sessions.js index 67356dc2f0..36bd1fe5b0 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -1508,7 +1508,9 @@ function closeSessionActionMenu(){ _sessionActionMenu = null; } if(_sessionActionAnchor){ - _sessionActionAnchor.classList.remove('active'); + if(_sessionActionAnchor.classList&&_sessionActionAnchor.classList.contains('session-actions-trigger')){ + _sessionActionAnchor.classList.remove('active'); + } const row=_sessionActionAnchor.closest('.session-item'); if(row) row.classList.remove('menu-open'); _sessionActionAnchor = null; @@ -1573,6 +1575,37 @@ function _appendSessionDuplicateAction(menu, session){ )); } +function _playSessionActionMenuEntrance(menu){ + if(!menu) return; + const reduce=window.matchMedia&&window.matchMedia('(prefers-reduced-motion: reduce)').matches; + if(reduce) return; + if(typeof menu.animate==='function'){ + try{ + const anim=menu.animate( + [ + {opacity:0, transform:'translate3d(0,-4px,0) scale(.985)'}, + {opacity:1, transform:'translate3d(0,0,0) scale(1)'} + ], + {duration:500, easing:'cubic-bezier(.2,.8,.2,1)'} + ); + if(anim&&anim.finished) anim.finished.catch(()=>{}); + return; + }catch(_){} + } + menu.classList.add('open-animated'); +} + +async function _archiveSession(session, archived=true){ + if(_isReadOnlySession(session)){ if(typeof showToast==='function') showToast('Read-only imported sessions cannot be modified.',3000); return; } + try{ + const response=await api('/api/session/archive',{method:'POST',body:JSON.stringify({session_id:session.session_id,archived})}); + session.archived=archived; + if(S.session&&S.session.session_id===session.session_id) S.session.archived=archived; + await renderSessionList(); + showToast(archived?_sessionArchiveToast(response,session):t('session_restored')); + }catch(err){showToast(t('session_archive_failed')+err.message);} +} + function _openSessionActionMenu(session, anchorEl){ if(_isReadOnlySession(session)){ if(typeof showToast==='function') showToast('Read-only imported sessions cannot be modified.',3000); return; } if(_sessionActionMenu && _sessionActionSessionId===session.session_id && _sessionActionAnchor===anchorEl){ @@ -1584,7 +1617,7 @@ function _openSessionActionMenu(session, anchorEl){ const isCliSession = _isCliSession(session); const isExternalSession = isMessagingSession || isCliSession; const menu=document.createElement('div'); - menu.className='session-action-menu open'; + menu.className='session-action-menu'; // Rename — first menu item by request (#1764). Double-click rename is // timing-sensitive: the first click frequently registers as "open the // chat" before the second click arrives, so users open the conversation @@ -1643,13 +1676,7 @@ function _openSessionActionMenu(session, anchorEl){ session.archived?ICONS.unarchive:ICONS.archive, async()=>{ closeSessionActionMenu(); - try{ - const response=await api('/api/session/archive',{method:'POST',body:JSON.stringify({session_id:session.session_id,archived:!session.archived})}); - session.archived=!session.archived; - if(S.session&&S.session.session_id===session.session_id) S.session.archived=session.archived; - await renderSessionList(); - showToast(session.archived?_sessionArchiveToast(response,session):t('session_restored')); - }catch(err){showToast(t('session_archive_failed')+err.message);} + await _archiveSession(session,!session.archived); } )); if(!isExternalSession){ @@ -1695,10 +1722,11 @@ function _openSessionActionMenu(session, anchorEl){ _sessionActionMenu = menu; _sessionActionAnchor = anchorEl; _sessionActionSessionId = session.session_id; - anchorEl.classList.add('active'); + if(anchorEl.classList&&anchorEl.classList.contains('session-actions-trigger')) anchorEl.classList.add('active'); const row=anchorEl.closest('.session-item'); if(row) row.classList.add('menu-open'); _positionSessionActionMenu(anchorEl); + _playSessionActionMenuEntrance(menu); } document.addEventListener('click',e=>{ @@ -3133,8 +3161,63 @@ function renderSessionListFromCache(){ let _pointerActive=false; let _isDragging=false; let _clearDragTimer=null; + let _longPressTimer=null; + let _longPressMenuOpened=false; + let _swipeHandled=false; + const _longPressDelay=560; + const _swipeActionThreshold=96; + const _swipeCancelRatio=0.75; + const _clearLongPressTimer=()=>{ + if(_longPressTimer){clearTimeout(_longPressTimer);_longPressTimer=null;} + }; + const _beginSessionTouchGesture=(clientX,clientY)=>{ + _pointerActive=true; + _pointerDownX=clientX; + _pointerDownY=clientY; + _isDragging=false; + _longPressMenuOpened=false; + _swipeHandled=false; + if(_clearDragTimer){clearTimeout(_clearDragTimer);_clearDragTimer=null;} + el.classList.remove('dragging'); + }; + const _scheduleSessionLongPressMenu=()=>{ + _clearLongPressTimer(); + _longPressTimer=setTimeout(()=>{ + if(!_pointerActive||_isDragging||_renamingSid||_sessionSelectMode||readOnly) return; + _longPressMenuOpened=true; + clearTimeout(_tapTimer); + _tapTimer=null; + _lastTapTime=0; + _openSessionActionMenu(s, el); + },_longPressDelay); + }; + const _isSessionSwipeTarget=()=>{ + return !readOnly&&!_renamingSid&&!_sessionSelectMode; + }; + const _canSwipeDeleteSession=()=>{ + return _isSessionSwipeTarget()&&!_isMessagingSession(s)&&!_isCliSession(s); + }; + const _handleSessionSwipe=(signedDx,signedDy)=>{ + if(_swipeHandled||!_isSessionSwipeTarget()) return false; + if(Math.abs(signedDx)<_swipeActionThreshold) return false; + if(Math.abs(signedDy)>Math.abs(signedDx)*_swipeCancelRatio) return false; + _swipeHandled=true; + _clearLongPressTimer(); + clearTimeout(_tapTimer); + _tapTimer=null; + _lastTapTime=0; + if(signedDx>0){ + _archiveSession(s,true); + }else if(_canSwipeDeleteSession()){ + deleteSession(s.session_id); + }else if(typeof showToast==='function'){ + showToast('Imported sessions cannot be deleted here.',3000); + } + return true; + }; const _clearPointerDragState=()=>{ _pointerActive=false; + _clearLongPressTimer(); if(_isDragging){ _isDragging=false; if(_clearDragTimer){clearTimeout(_clearDragTimer);_clearDragTimer=null;} @@ -3143,35 +3226,43 @@ function renderSessionListFromCache(){ }; el.onpointerdown=(e)=>{ if(e.pointerType==='mouse' && e.button!==0) return; - _pointerActive=true; - _pointerDownX=e.clientX; - _pointerDownY=e.clientY; - _isDragging=false; - if(_clearDragTimer){clearTimeout(_clearDragTimer);_clearDragTimer=null;} - el.classList.remove('dragging'); + _beginSessionTouchGesture(e.clientX,e.clientY); + if(e.pointerType==='touch'||e.pointerType==='pen'){ + _scheduleSessionLongPressMenu(); + } }; el.onpointermove=(e)=>{ // Plain hover also dispatches pointermove. Only mark a row as dragging // after an actual press starts on this row; otherwise hovered rows stay // faded until the next sidebar rerender clears their DOM nodes. if(!_pointerActive) return; - if(_isDragging) return; const dx=Math.abs(e.clientX-_pointerDownX); const dy=Math.abs(e.clientY-_pointerDownY); - if(dx>5||dy>5){ + if(!_isDragging&&(dx>5||dy>5)){ + if(dy>8||dx>10) _clearLongPressTimer(); _isDragging=true; el.classList.add('dragging'); // Cancel any pending drag-clear so we don't flash hover mid-drag if(_clearDragTimer){clearTimeout(_clearDragTimer);_clearDragTimer=null;} } + const signedDx=e.clientX-_pointerDownX; + const signedDy=e.clientY-_pointerDownY; + _handleSessionSwipe(signedDx,signedDy); }; el.onpointercancel=_clearPointerDragState; el.onpointerleave=()=>{ if(_pointerActive) _clearPointerDragState(); }; el.onpointerup=(e)=>{ if(e.pointerType==='mouse' && e.button!==0) return; // ignore right/middle click _pointerActive=false; + _clearLongPressTimer(); if(_renamingSid) return; if(actions&&actions.contains(e.target)) return; + if(_longPressMenuOpened||_swipeHandled){e.stopPropagation();return;} + if(_sessionActionMenu&&!_sessionActionMenu.contains(e.target)){ + closeSessionActionMenu(); + e.stopPropagation(); + return; + } if(e.target&&e.target.closest&&e.target.closest('.session-child-count,.session-child-sessions,.session-child-session,.session-lineage-count,.session-lineage-segments,.session-lineage-segment')) return; if(_sessionSelectMode){e.stopPropagation();if(!readOnly)toggleSessionSelect(s.session_id);return;} // If the pointer moved enough to be a drag, cancel any pending tap @@ -3215,6 +3306,42 @@ function renderSessionListFromCache(){ if (_loadingSessionId && _loadingSessionId !== s.session_id) return; startRename(); }; + el.oncontextmenu=(e)=>{ + if(e.pointerType==='touch'||e.pointerType==='pen'){ + e.preventDefault(); + } + }; + el.addEventListener('touchstart',(e)=>{ + const touch=e.changedTouches&&e.changedTouches[0]; + if(!touch) return; + _beginSessionTouchGesture(touch.clientX,touch.clientY); + _scheduleSessionLongPressMenu(); + },{passive:true}); + el.addEventListener('touchmove',(e)=>{ + if(!_pointerActive) return; + const touch=e.changedTouches&&e.changedTouches[0]; + if(!touch) return; + const signedDx=touch.clientX-_pointerDownX; + const signedDy=touch.clientY-_pointerDownY; + const dx=Math.abs(signedDx); + const dy=Math.abs(signedDy); + if(dx>10||dy>8) _clearLongPressTimer(); + if(!_isDragging&&(dx>5||dy>5)){ + _isDragging=true; + el.classList.add('dragging'); + if(_clearDragTimer){clearTimeout(_clearDragTimer);_clearDragTimer=null;} + } + if(dx>16&&dx>dy*1.2) e.preventDefault(); + _handleSessionSwipe(signedDx,signedDy); + },{passive:false}); + el.addEventListener('touchend',()=>{ + _pointerActive=false; + _clearLongPressTimer(); + if(_isDragging){ + _isDragging=false; + _clearDragTimer=setTimeout(()=>{el.classList.remove('dragging');_clearDragTimer=null;},50); + } + },{passive:true}); return el; } } diff --git a/static/style.css b/static/style.css index 2874289db8..f47e581dfd 100644 --- a/static/style.css +++ b/static/style.css @@ -353,7 +353,7 @@ and attention indicator (26x26 at right:6px) still need 40px reserved when they're visible — covered by the hover / streaming / unread / menu-open / focus-within rule below. */ - .session-item{padding:8px 8px;margin-bottom:2px;border-radius:8px;cursor:pointer;font-size:13px;color:var(--muted);transition:background .15s,color .15s;display:flex;align-items:flex-start;gap:8px;min-width:0;position:relative;touch-action:manipulation;-webkit-tap-highlight-color:transparent;} + .session-item{padding:8px 8px;margin-bottom:2px;border-radius:8px;cursor:pointer;font-size:13px;color:var(--muted);transition:background .15s,color .15s;display:flex;align-items:flex-start;gap:8px;min-width:0;position:relative;touch-action:pan-y;-webkit-tap-highlight-color:transparent;user-select:none;-webkit-user-select:none;-webkit-touch-callout:none;} .session-item.streaming,.session-item.unread,.session-item:focus-within,.session-item.menu-open{padding-right:40px;} .session-item:hover{background:var(--hover-bg);color:var(--text);} /* Suppress hover highlight during drag to avoid visual noise mid-scroll */ @@ -422,8 +422,8 @@ .session-actions-trigger:hover{background:var(--hover-bg);color:var(--text);} .session-actions-trigger.active{background:var(--accent-bg);border-color:var(--accent-bg-strong);color:var(--text);} .session-actions-trigger svg{display:block;} - .session-action-menu{display:block;position:fixed;left:0;top:0;right:auto;bottom:auto;min-width:220px;max-width:min(280px,calc(100vw - 16px));background:var(--surface);border:1px solid var(--border2);border-radius:10px;box-shadow:0 -4px 24px rgba(0,0,0,.4);z-index:999;overflow:hidden;max-height:320px;overflow-y:auto;} - .session-action-menu.open{display:block;} + .session-action-menu{display:block;position:fixed;left:0;top:0;right:auto;bottom:auto;min-width:220px;max-width:min(280px,calc(100vw - 16px));background:var(--surface);border:1px solid var(--border2);border-radius:10px;box-shadow:0 -4px 24px rgba(0,0,0,.4);z-index:999;overflow:hidden;max-height:calc(100vh - 16px);overflow-y:auto;transform-origin:top right;will-change:opacity,transform;} + .session-action-menu.open-animated{animation:session-menu-in .5s cubic-bezier(.2,.8,.2,1);} .session-action-opt{width:100%;background:none;border:none;text-align:left;font:inherit;color:var(--text);flex-direction:row!important;gap:0!important;padding:0!important;} .session-action-opt .ws-opt-action{display:flex;flex-direction:row;align-items:center;gap:10px;width:100%;padding:10px 14px;} .session-action-opt .ws-opt-icon{color:var(--muted);transition:color .12s,opacity .12s;flex-shrink:0;display:flex;align-items:center;width:16px;} @@ -433,8 +433,12 @@ .session-action-opt.is-active{background:var(--accent-bg);} .session-action-opt.danger:hover{background:rgba(239,83,80,.08);} .session-action-opt.danger .ws-opt-icon,.session-action-opt.danger .ws-opt-name{color:var(--error);} + @media (prefers-reduced-motion:reduce){ + .session-action-menu{animation:none;will-change:auto;} + } /* Hide overlay during inline rename */ .session-item:has(.session-title-input) .session-actions{display:none;} + @keyframes session-menu-in{from{opacity:0;transform:translate3d(0,-4px,0) scale(.985);}to{opacity:1;transform:translate3d(0,0,0) scale(1);}} @keyframes newflash{0%{background:var(--accent-bg-strong);color:var(--accent);}100%{background:transparent;color:var(--muted);}} @keyframes spin{to{transform:rotate(360deg);}} .session-item.new-flash{animation:newflash 1.4s ease-out forwards;} @@ -1538,6 +1542,13 @@ .suggestion{font-size:12px;padding:10px 12px;} } + @media (hover:none) and (pointer:coarse){ + .session-actions{display:none;} + .session-item{padding-right:12px;} + .session-item.streaming,.session-item.unread{padding-right:40px;} + .session-item:focus-within,.session-item.menu-open{padding-right:12px;} + } + @media (max-width: 340px){ /* Extreme legacy-phone widths (e.g. 320px) cannot fit five 44px left-side touch targets plus the fixed send button with the normal diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py new file mode 100644 index 0000000000..0b48386621 --- /dev/null +++ b/tests/test_session_touch_actions.py @@ -0,0 +1,78 @@ +from pathlib import Path + + +ROOT = Path(__file__).resolve().parent.parent +SESSIONS_JS = (ROOT / "static" / "sessions.js").read_text(encoding="utf-8") +STYLE_CSS = (ROOT / "static" / "style.css").read_text(encoding="utf-8") + + +def test_session_menu_uses_viewport_height_not_fixed_scroll_cap(): + assert "max-height:calc(100vh - 16px)" in STYLE_CSS + session_menu = STYLE_CSS[STYLE_CSS.find(".session-action-menu{"):STYLE_CSS.find(".session-action-menu.open")] + assert "max-height:320px" not in session_menu + + +def test_session_menu_has_subtle_open_animation(): + session_menu = STYLE_CSS[STYLE_CSS.find(".session-action-menu{"):STYLE_CSS.find(".session-action-menu.open")] + assert "will-change:opacity,transform" in session_menu + assert "transform-origin:top right" in session_menu + assert "function _playSessionActionMenuEntrance(menu){" in SESSIONS_JS + assert "typeof menu.animate==='function'" in SESSIONS_JS + assert "{opacity:0, transform:'translate3d(0,-4px,0) scale(.985)'}" in SESSIONS_JS + assert "{duration:500, easing:'cubic-bezier(.2,.8,.2,1)'}" in SESSIONS_JS + assert "menu.classList.add('open-animated')" in SESSIONS_JS + assert ".session-action-menu.open-animated{animation:session-menu-in .5s cubic-bezier(.2,.8,.2,1);}" in STYLE_CSS + assert "@keyframes session-menu-in" in STYLE_CSS + assert "@media (prefers-reduced-motion:reduce)" in STYLE_CSS + assert ".session-action-menu{animation:none;will-change:auto;}" in STYLE_CSS + + +def test_mobile_session_menu_opens_from_long_press_and_hides_dots(): + assert "_longPressDelay=560" in SESSIONS_JS + assert "_openSessionActionMenu(s, el)" in SESSIONS_JS + assert "@media (hover:none) and (pointer:coarse)" in STYLE_CSS + assert ".session-actions{display:none;}" in STYLE_CSS + assert "const _beginSessionTouchGesture=(clientX,clientY)=>{" in SESSIONS_JS + assert "const _scheduleSessionLongPressMenu=()=>{" in SESSIONS_JS + mobile_touch = STYLE_CSS[STYLE_CSS.find("@media (hover:none) and (pointer:coarse)"):STYLE_CSS.find("@media (max-width: 340px)")] + assert ".session-item{padding-right:12px;}" in mobile_touch + assert ".session-item.streaming,.session-item.unread{padding-right:40px;}" in mobile_touch + assert ".session-item:focus-within,.session-item.menu-open{padding-right:12px;}" in mobile_touch + + +def test_open_session_menu_consumes_next_row_activation(): + assert "if(_sessionActionMenu&&!_sessionActionMenu.contains(e.target)){" in SESSIONS_JS + assert "closeSessionActionMenu();" in SESSIONS_JS + assert "e.stopPropagation();" in SESSIONS_JS + pointerup_idx = SESSIONS_JS.find("el.onpointerup=(e)=>{") + dismiss_idx = SESSIONS_JS.find("if(_sessionActionMenu&&!_sessionActionMenu.contains(e.target)){", pointerup_idx) + load_idx = SESSIONS_JS.find("await loadSession(s.session_id)", pointerup_idx) + assert pointerup_idx > 0 and load_idx > pointerup_idx + assert dismiss_idx > pointerup_idx and dismiss_idx < load_idx + + +def test_session_swipes_archive_right_and_delete_left(): + assert "_swipeActionThreshold=96" in SESSIONS_JS + assert "const _handleSessionSwipe=(signedDx,signedDy)=>{" in SESSIONS_JS + assert "if(signedDx>0){" in SESSIONS_JS + assert "_archiveSession(s,true)" in SESSIONS_JS + assert "deleteSession(s.session_id)" in SESSIONS_JS + assert "if(!_isDragging&&(dx>5||dy>5))" in SESSIONS_JS + assert "_handleSessionSwipe(signedDx,signedDy)" in SESSIONS_JS + + +def test_ios_touch_events_drive_session_swipes(): + assert "el.addEventListener('touchstart'" in SESSIONS_JS + assert "el.addEventListener('touchmove'" in SESSIONS_JS + assert "el.addEventListener('touchend'" in SESSIONS_JS + assert "{passive:false}" in SESSIONS_JS + assert "e.preventDefault()" in SESSIONS_JS + + +def test_touch_session_rows_preserve_vertical_scroll(): + assert ".session-item{padding:8px 8px;" in STYLE_CSS + item_rule = STYLE_CSS[STYLE_CSS.find(".session-item{padding:8px 8px;"):STYLE_CSS.find("}", STYLE_CSS.find(".session-item{padding:8px 8px;"))] + assert "touch-action:pan-y" in item_rule + assert "user-select:none" in item_rule + assert "-webkit-user-select:none" in item_rule + assert "-webkit-touch-callout:none" in item_rule From 892a946851cd9e6379d179d6215c8fe10a38a3a1 Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Thu, 14 May 2026 08:54:43 -0600 Subject: [PATCH 002/349] fix tests --- static/sessions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/sessions.js b/static/sessions.js index 36bd1fe5b0..f1d04f8e81 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -1602,7 +1602,7 @@ async function _archiveSession(session, archived=true){ session.archived=archived; if(S.session&&S.session.session_id===session.session_id) S.session.archived=archived; await renderSessionList(); - showToast(archived?_sessionArchiveToast(response,session):t('session_restored')); + showToast(session.archived?_sessionArchiveToast(response,session):t('session_restored')); }catch(err){showToast(t('session_archive_failed')+err.message);} } From 5b2c8c11f1a09ce953013e6c25042e918a757e31 Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Fri, 15 May 2026 08:38:42 -0600 Subject: [PATCH 003/349] fix: avoid sticky touch hover in session list --- static/sessions.js | 2 ++ static/style.css | 10 +++++----- tests/test_session_touch_actions.py | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/static/sessions.js b/static/sessions.js index 6b41154c02..867ac33f61 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -3288,6 +3288,7 @@ function renderSessionListFromCache(){ clearTimeout(_tapTimer); _tapTimer=null; _lastTapTime=0; + el.classList.remove('loading'); startRename(); return; } @@ -3297,6 +3298,7 @@ function renderSessionListFromCache(){ // accidental navigation during scroll-drag lifts. clearTimeout(_tapTimer); const delay=e.pointerType==='mouse'?0:300; + if(e.pointerType!=='mouse') el.classList.add('loading'); _tapTimer=setTimeout(async()=>{ _tapTimer=null; _lastTapTime=0; diff --git a/static/style.css b/static/style.css index 89e5b9ce38..df4f5376ec 100644 --- a/static/style.css +++ b/static/style.css @@ -206,7 +206,6 @@ :root:not(.dark) *{scrollbar-color:rgba(0,0,0,.15) transparent;} /* ── Light mode: sidebar, roles, chips, active states ── */ :root:not(.dark) .session-item{color:var(--muted);} - :root:not(.dark) .session-item:hover{background:var(--hover-bg);color:var(--text);} :root:not(.dark) .session-item.active{background:var(--accent-bg);color:var(--accent-text);} :root:not(.dark) .session-item.active .session-title{color:var(--accent-text);} :root:not(.dark) .session-pin-indicator{color:var(--accent-text);} @@ -354,14 +353,15 @@ menu-open / focus-within rule below. */ .session-item{padding:8px 8px;margin-bottom:2px;border-radius:8px;cursor:pointer;font-size:13px;color:var(--muted);transition:background .15s,color .15s;display:flex;align-items:flex-start;gap:8px;min-width:0;position:relative;touch-action:pan-y;-webkit-tap-highlight-color:transparent;user-select:none;-webkit-user-select:none;-webkit-touch-callout:none;} .session-item.streaming,.session-item.unread,.session-item:focus-within,.session-item.menu-open{padding-right:40px;} - .session-item:hover{background:var(--hover-bg);color:var(--text);} + @media (hover:hover){.session-item:hover{background:var(--hover-bg);color:var(--text);}} + .session-item.loading{background:var(--hover-bg);color:var(--text);} /* Suppress hover highlight during drag to avoid visual noise mid-scroll */ .session-item.dragging:hover{background:transparent;color:var(--muted);} /* Restore hover padding-right only for mouse (hover:hover) devices. Touch/iPad (hover:none) must NOT expand padding-right on :hover — the expansion causes a layout-reflow mid-tap that moves session-actions under the finger, triggering stopPropagation and swallowing navigation. */ - @media (hover:hover){.session-item:hover{padding-right:40px;}} + @media (hover:hover){:root:not(.dark) .session-item:hover{background:var(--hover-bg);color:var(--text);}.session-item:hover{padding-right:40px;}} .session-item.active{background:var(--accent-bg);color:var(--accent);} .session-item.streaming .session-title{color:var(--accent);} .session-item.streaming .session-title-row{color:var(--text);} @@ -1551,9 +1551,9 @@ @media (hover:none) and (pointer:coarse){ .session-actions{display:none;} - .session-item{padding-right:12px;} + .session-item{padding-right:6px;} .session-item.streaming,.session-item.unread{padding-right:40px;} - .session-item:focus-within,.session-item.menu-open{padding-right:12px;} + .session-item:focus-within,.session-item.menu-open{padding-right:6px;} } @media (max-width: 340px){ diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py index 0b48386621..c4f917aa6d 100644 --- a/tests/test_session_touch_actions.py +++ b/tests/test_session_touch_actions.py @@ -35,9 +35,9 @@ def test_mobile_session_menu_opens_from_long_press_and_hides_dots(): assert "const _beginSessionTouchGesture=(clientX,clientY)=>{" in SESSIONS_JS assert "const _scheduleSessionLongPressMenu=()=>{" in SESSIONS_JS mobile_touch = STYLE_CSS[STYLE_CSS.find("@media (hover:none) and (pointer:coarse)"):STYLE_CSS.find("@media (max-width: 340px)")] - assert ".session-item{padding-right:12px;}" in mobile_touch + assert ".session-item{padding-right:6px;}" in mobile_touch assert ".session-item.streaming,.session-item.unread{padding-right:40px;}" in mobile_touch - assert ".session-item:focus-within,.session-item.menu-open{padding-right:12px;}" in mobile_touch + assert ".session-item:focus-within,.session-item.menu-open{padding-right:6px;}" in mobile_touch def test_open_session_menu_consumes_next_row_activation(): From 4d7fa305fa160a1ecbffae45e4af5f243c5642f6 Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Sat, 16 May 2026 13:45:15 -0600 Subject: [PATCH 004/349] Polish mobile session swipe feedback --- static/sessions.js | 126 ++++++++++++++++++++++------ static/style.css | 52 +++++++++++- tests/test_session_touch_actions.py | 67 +++++++++++++-- 3 files changed, 210 insertions(+), 35 deletions(-) diff --git a/static/sessions.js b/static/sessions.js index 1ad782146a..ba496d0a64 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -1524,7 +1524,7 @@ function closeSessionActionMenu(){ _sessionActionAnchor.classList.remove('active'); } const row=_sessionActionAnchor.closest('.session-item'); - if(row) row.classList.remove('menu-open'); + if(row) row.classList.remove('menu-open','long-pressing'); _sessionActionAnchor = null; } _sessionActionSessionId = null; @@ -1598,7 +1598,7 @@ function _playSessionActionMenuEntrance(menu){ {opacity:0, transform:'translate3d(0,-4px,0) scale(.985)'}, {opacity:1, transform:'translate3d(0,0,0) scale(1)'} ], - {duration:500, easing:'cubic-bezier(.2,.8,.2,1)'} + {duration:450, easing:'cubic-bezier(.2,.8,.2,1)'} ); if(anim&&anim.finished) anim.finished.catch(()=>{}); return; @@ -1608,14 +1608,15 @@ function _playSessionActionMenuEntrance(menu){ } async function _archiveSession(session, archived=true){ - if(_isReadOnlySession(session)){ if(typeof showToast==='function') showToast('Read-only imported sessions cannot be modified.',3000); return; } + if(_isReadOnlySession(session)){ if(typeof showToast==='function') showToast('Read-only imported sessions cannot be modified.',3000); return false; } try{ const response=await api('/api/session/archive',{method:'POST',body:JSON.stringify({session_id:session.session_id,archived})}); session.archived=archived; if(S.session&&S.session.session_id===session.session_id) S.session.archived=archived; await renderSessionList(); showToast(session.archived?_sessionArchiveToast(response,session):t('session_restored')); - }catch(err){showToast(t('session_archive_failed')+err.message);} + return true; + }catch(err){showToast(t('session_archive_failed')+err.message);return false;} } function _openSessionActionMenu(session, anchorEl){ @@ -3191,24 +3192,35 @@ function renderSessionListFromCache(){ let _longPressTimer=null; let _longPressMenuOpened=false; let _swipeHandled=false; - const _longPressDelay=560; - const _swipeActionThreshold=96; + let _swipeTracking=false; + let _pointerX=0; + let _pointerY=0; + let _gesturePointerType=''; + const _longPressDelay=400; + const _swipeActionThreshold=144; const _swipeCancelRatio=0.75; + const _committedSwipeDuration=420; const _clearLongPressTimer=()=>{ if(_longPressTimer){clearTimeout(_longPressTimer);_longPressTimer=null;} + if(!_longPressMenuOpened) el.classList.remove('long-pressing'); }; - const _beginSessionTouchGesture=(clientX,clientY)=>{ + const _beginSessionGesture=(clientX,clientY)=>{ _pointerActive=true; + _gesturePointerType=''; _pointerDownX=clientX; _pointerDownY=clientY; + _pointerX=clientX; + _pointerY=clientY; _isDragging=false; + _swipeTracking=false; _longPressMenuOpened=false; _swipeHandled=false; if(_clearDragTimer){clearTimeout(_clearDragTimer);_clearDragTimer=null;} - el.classList.remove('dragging'); + el.classList.remove('dragging','swipe-committed'); }; const _scheduleSessionLongPressMenu=()=>{ _clearLongPressTimer(); + el.classList.add('long-pressing'); _longPressTimer=setTimeout(()=>{ if(!_pointerActive||_isDragging||_renamingSid||_sessionSelectMode||readOnly) return; _longPressMenuOpened=true; @@ -3219,11 +3231,37 @@ function renderSessionListFromCache(){ },_longPressDelay); }; const _isSessionSwipeTarget=()=>{ - return !readOnly&&!_renamingSid&&!_sessionSelectMode; + return _gesturePointerType!=='mouse'&&!readOnly&&!_renamingSid&&!_sessionSelectMode; + }; + const _trackHorizontalSwipe=(dx,dy)=>{ + if(dx>16&&dx>dy*1.2) _swipeTracking=true; }; const _canSwipeDeleteSession=()=>{ return _isSessionSwipeTarget()&&!_isMessagingSession(s)&&!_isCliSession(s); }; + const _paintSessionSwipe=(signedDx)=>{ + const offset=Math.max(-72,Math.min(72,signedDx*.55)); + const progress=Math.min(1,Math.abs(offset)/72); + el.style.setProperty('--session-swipe-offset',offset+'px'); + el.style.setProperty('--session-swipe-progress',Math.pow(progress,1.5)); + el.classList.toggle('swiping-right',offset>0); + el.classList.toggle('swiping-left',offset<0); + }; + const _clearSessionSwipePaint=()=>{ + el.style.removeProperty('--session-swipe-offset'); + el.style.removeProperty('--session-swipe-progress'); + el.classList.remove('swiping-right','swiping-left','swipe-committed'); + }; + const _settleSessionSwipePaint=()=>{ + el.classList.remove('dragging'); + requestAnimationFrame(()=>requestAnimationFrame(_clearSessionSwipePaint)); + }; + const _completeSessionSwipePaint=(signedDx)=>{ + el.classList.remove('dragging'); + el.classList.add('swipe-committed'); + el.style.setProperty('--session-swipe-progress','0'); + el.style.setProperty('--session-swipe-offset',(signedDx>0?1:-1)*window.innerWidth+'px'); + }; const _handleSessionSwipe=(signedDx,signedDy)=>{ if(_swipeHandled||!_isSessionSwipeTarget()) return false; if(Math.abs(signedDx)<_swipeActionThreshold) return false; @@ -3234,26 +3272,42 @@ function renderSessionListFromCache(){ _tapTimer=null; _lastTapTime=0; if(signedDx>0){ - _archiveSession(s,true); + _completeSessionSwipePaint(signedDx); + setTimeout(async()=>{ + const archived=await _archiveSession(s,!s.archived); + if(!archived) _settleSessionSwipePaint(); + },_committedSwipeDuration); }else if(_canSwipeDeleteSession()){ - deleteSession(s.session_id); + el.classList.remove('dragging'); + deleteSession(s.session_id,async()=>{ + _completeSessionSwipePaint(signedDx); + await new Promise(resolve=>setTimeout(resolve,_committedSwipeDuration)); + }).then((deleted)=>{ + if(!deleted) _settleSessionSwipePaint(); + }); }else if(typeof showToast==='function'){ showToast('Imported sessions cannot be deleted here.',3000); + _swipeHandled=false; + _settleSessionSwipePaint(); } return true; }; + const _commitSessionSwipe=()=>{ + return _handleSessionSwipe(_pointerX-_pointerDownX,_pointerY-_pointerDownY); + }; const _clearPointerDragState=()=>{ _pointerActive=false; _clearLongPressTimer(); if(_isDragging){ _isDragging=false; if(_clearDragTimer){clearTimeout(_clearDragTimer);_clearDragTimer=null;} - _clearDragTimer=setTimeout(()=>{el.classList.remove('dragging');_clearDragTimer=null;},50); + _clearDragTimer=setTimeout(()=>{_settleSessionSwipePaint();_clearDragTimer=null;},50); } }; el.onpointerdown=(e)=>{ if(e.pointerType==='mouse' && e.button!==0) return; - _beginSessionTouchGesture(e.clientX,e.clientY); + _beginSessionGesture(e.clientX,e.clientY); + _gesturePointerType=e.pointerType||''; if(e.pointerType==='touch'||e.pointerType==='pen'){ _scheduleSessionLongPressMenu(); } @@ -3263,6 +3317,8 @@ function renderSessionListFromCache(){ // after an actual press starts on this row; otherwise hovered rows stay // faded until the next sidebar rerender clears their DOM nodes. if(!_pointerActive) return; + _pointerX=e.clientX; + _pointerY=e.clientY; const dx=Math.abs(e.clientX-_pointerDownX); const dy=Math.abs(e.clientY-_pointerDownY); if(!_isDragging&&(dx>5||dy>5)){ @@ -3274,7 +3330,8 @@ function renderSessionListFromCache(){ } const signedDx=e.clientX-_pointerDownX; const signedDy=e.clientY-_pointerDownY; - _handleSessionSwipe(signedDx,signedDy); + _trackHorizontalSwipe(Math.abs(signedDx),Math.abs(signedDy)); + if(_isSessionSwipeTarget()&&(_swipeTracking||Math.abs(signedDx)>Math.abs(signedDy))) _paintSessionSwipe(signedDx); }; el.onpointercancel=_clearPointerDragState; el.onpointerleave=()=>{ if(_pointerActive) _clearPointerDragState(); }; @@ -3284,6 +3341,9 @@ function renderSessionListFromCache(){ _clearLongPressTimer(); if(_renamingSid) return; if(actions&&actions.contains(e.target)) return; + _pointerX=e.clientX; + _pointerY=e.clientY; + _commitSessionSwipe(); if(_longPressMenuOpened||_swipeHandled){e.stopPropagation();return;} if(_sessionActionMenu&&!_sessionActionMenu.contains(e.target)){ closeSessionActionMenu(); @@ -3293,7 +3353,7 @@ function renderSessionListFromCache(){ if(e.target&&e.target.closest&&e.target.closest('.session-child-count,.session-child-sessions,.session-child-session,.session-lineage-count,.session-lineage-segments,.session-lineage-segment')) return; if(_sessionSelectMode){e.stopPropagation();if(!readOnly)toggleSessionSelect(s.session_id);return;} // If the pointer moved enough to be a drag, cancel any pending tap - if(_isDragging){clearTimeout(_tapTimer);_tapTimer=null;_lastTapTime=0;_clearDragTimer=setTimeout(()=>{el.classList.remove('dragging');_clearDragTimer=null;},50);return;} + if(_isDragging){clearTimeout(_tapTimer);_tapTimer=null;_lastTapTime=0;_clearDragTimer=setTimeout(()=>{_settleSessionSwipePaint();_clearDragTimer=null;},50);return;} const now=Date.now(); if(now-_lastTapTime<350){ // Double-tap: rename @@ -3321,8 +3381,12 @@ function renderSessionListFromCache(){ await api('/api/session/import_cli',{method:'POST',body:JSON.stringify({session_id:s.session_id})}); }catch(e){ /* import failed -- fall through to read-only view */ } } - await loadSession(s.session_id);renderSessionListFromCache(); - if(typeof closeMobileSidebar==='function')closeMobileSidebar(); + try{ + await loadSession(s.session_id);renderSessionListFromCache(); + if(typeof closeMobileSidebar==='function')closeMobileSidebar(); + }finally{ + el.classList.remove('loading'); + } }, delay); }; // Add ondblclick for more reliable double-click detection @@ -3343,13 +3407,16 @@ function renderSessionListFromCache(){ el.addEventListener('touchstart',(e)=>{ const touch=e.changedTouches&&e.changedTouches[0]; if(!touch) return; - _beginSessionTouchGesture(touch.clientX,touch.clientY); + _beginSessionGesture(touch.clientX,touch.clientY); + _gesturePointerType='touch'; _scheduleSessionLongPressMenu(); },{passive:true}); el.addEventListener('touchmove',(e)=>{ if(!_pointerActive) return; const touch=e.changedTouches&&e.changedTouches[0]; if(!touch) return; + _pointerX=touch.clientX; + _pointerY=touch.clientY; const signedDx=touch.clientX-_pointerDownX; const signedDy=touch.clientY-_pointerDownY; const dx=Math.abs(signedDx); @@ -3360,15 +3427,22 @@ function renderSessionListFromCache(){ el.classList.add('dragging'); if(_clearDragTimer){clearTimeout(_clearDragTimer);_clearDragTimer=null;} } - if(dx>16&&dx>dy*1.2) e.preventDefault(); - _handleSessionSwipe(signedDx,signedDy); + _trackHorizontalSwipe(dx,dy); + if(_isSessionSwipeTarget()&&(_swipeTracking||dx>dy)) _paintSessionSwipe(signedDx); + if(_swipeTracking) e.preventDefault(); },{passive:false}); - el.addEventListener('touchend',()=>{ + el.addEventListener('touchend',(e)=>{ _pointerActive=false; _clearLongPressTimer(); + const touch=e.changedTouches&&e.changedTouches[0]; + if(touch){ + _pointerX=touch.clientX; + _pointerY=touch.clientY; + } + _commitSessionSwipe(); if(_isDragging){ _isDragging=false; - _clearDragTimer=setTimeout(()=>{el.classList.remove('dragging');_clearDragTimer=null;},50); + if(!_swipeHandled) _clearDragTimer=setTimeout(()=>{_settleSessionSwipePaint();_clearDragTimer=null;},50); } },{passive:true}); return el; @@ -3474,19 +3548,20 @@ async function removeWorktree(session){ } } -async function deleteSession(sid){ +async function deleteSession(sid, beforeDelete=null){ const session=_sessionSnapshotById(sid); const ok=await showConfirmDialog({ message:session&&session.worktree_path?t('session_delete_worktree_confirm',session.worktree_path):t('session_delete_confirm'), confirmLabel:t('delete_title'), danger:true }); - if(!ok)return; + if(!ok)return false; + if(beforeDelete) await beforeDelete(); let response=null; try{ response=await api('/api/session/delete',{method:'POST',body:JSON.stringify({session_id:sid})}); _clearHandoffStorageForSession(sid); - }catch(e){setStatus(`Delete failed: ${e.message}`);return;} + }catch(e){setStatus(`Delete failed: ${e.message}`);return false;} if(S.session&&S.session.session_id===sid){ S.session=null;S.messages=[];S.entries=[]; localStorage.removeItem('hermes-webui-session'); @@ -3506,6 +3581,7 @@ async function deleteSession(sid){ } showToast(_sessionResponseRetainsWorktree(response,session)?t('session_deleted_worktree'):t('session_deleted')); await renderSessionList(); + return true; } // ── Project helpers ───────────────────────────────────────────────────── diff --git a/static/style.css b/static/style.css index 87196b48eb..5ac6ae79f2 100644 --- a/static/style.css +++ b/static/style.css @@ -429,18 +429,65 @@ and attention indicator (26x26 at right:6px) still need 40px reserved when they're visible — covered by the hover / streaming / unread / menu-open / focus-within rule below. */ - .session-item{padding:8px 8px;margin-bottom:2px;border-radius:8px;cursor:pointer;font-size:13px;color:var(--muted);transition:background .15s,color .15s;display:flex;align-items:flex-start;gap:8px;min-width:0;position:relative;touch-action:pan-y;-webkit-tap-highlight-color:transparent;user-select:none;-webkit-user-select:none;-webkit-touch-callout:none;} + .session-item{padding:8px 8px;margin-bottom:2px;border-radius:8px;cursor:pointer;font-size:13px;color:var(--muted);transition:background .15s,color .15s,transform .5s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;display:flex;align-items:flex-start;gap:8px;min-width:0;position:relative;touch-action:pan-y;-webkit-tap-highlight-color:transparent;user-select:none;-webkit-user-select:none;-webkit-touch-callout:none;transform:translateX(var(--session-swipe-offset,0));} .session-item.streaming,.session-item.unread,.session-item:focus-within,.session-item.menu-open{padding-right:40px;} @media (hover:hover){.session-item:hover{background:var(--hover-bg);color:var(--text);}} .session-item.loading{background:var(--hover-bg);color:var(--text);} + .session-item.long-pressing{ + background:var(--hover-bg); + color:var(--text); + box-shadow:0 0 0 1px color-mix(in srgb,var(--accent) 38%,transparent); + animation:session-long-press .4s cubic-bezier(.2,.8,.2,1) both; + } + .session-item.swiping-right{background:color-mix(in srgb,var(--warning) 18%,var(--surface));box-shadow:0 0 0 1px color-mix(in srgb,var(--warning) 60%,transparent);} + .session-item.swiping-left{background:color-mix(in srgb,var(--error) 16%,var(--surface));box-shadow:0 0 0 1px color-mix(in srgb,var(--error) 60%,transparent);} + .session-item.swiping-right::after,.session-item.swiping-left::after{ + position:absolute; + top:0; + bottom:0; + display:flex; + align-items:center; + width:72px; + padding:0 10px; + box-sizing:border-box; + opacity:var(--session-swipe-progress,0); + font-size:10px; + font-weight:700; + letter-spacing:.06em; + text-transform:uppercase; + pointer-events:none; + } + .session-item.swiping-right::after{ + content:"Archive"; + left:0; + justify-content:flex-start; + transform:translateX(calc(-1 * var(--session-swipe-offset,0px))); + color:var(--warning); + background:transparent; + } + .session-item.swiping-left::after{ + content:"Delete"; + right:0; + justify-content:flex-end; + transform:translateX(calc(-1 * var(--session-swipe-offset,0px))); + color:var(--error); + background:transparent; + } + .session-item.dragging{transition:background .15s,color .15s,box-shadow .15s ease;} + .session-item.swipe-committed{transition:background .15s,color .15s,transform .42s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;} + .session-item.swipe-committed::after{transition:opacity .18s ease;} /* Suppress hover highlight during drag to avoid visual noise mid-scroll */ .session-item.dragging:hover{background:transparent;color:var(--muted);} + .session-item.dragging.swiping-right{background:color-mix(in srgb,var(--warning) 18%,var(--surface));} + .session-item.dragging.swiping-left{background:color-mix(in srgb,var(--error) 16%,var(--surface));} /* Restore hover padding-right only for mouse (hover:hover) devices. Touch/iPad (hover:none) must NOT expand padding-right on :hover — the expansion causes a layout-reflow mid-tap that moves session-actions under the finger, triggering stopPropagation and swallowing navigation. */ @media (hover:hover){:root:not(.dark) .session-item:hover{background:var(--hover-bg);color:var(--text);}.session-item:hover{padding-right:40px;}} .session-item.active{background:var(--accent-bg);color:var(--accent);} + .session-item.active.swiping-right{background:color-mix(in srgb,var(--warning) 22%,var(--accent-bg));} + .session-item.active.swiping-left{background:color-mix(in srgb,var(--error) 20%,var(--accent-bg));} .session-item.streaming .session-title{color:var(--accent);} .session-item.streaming .session-title-row{color:var(--text);} .session-text{flex:1;min-width:0;display:flex;flex-direction:column;gap:2px;overflow:hidden;} @@ -500,7 +547,7 @@ .session-actions-trigger.active{background:var(--accent-bg);border-color:var(--accent-bg-strong);color:var(--text);} .session-actions-trigger svg{display:block;} .session-action-menu{display:block;position:fixed;left:0;top:0;right:auto;bottom:auto;min-width:220px;max-width:min(280px,calc(100vw - 16px));background:var(--surface);border:1px solid var(--border2);border-radius:10px;box-shadow:0 -4px 24px rgba(0,0,0,.4);z-index:999;overflow:hidden;max-height:calc(100vh - 16px);overflow-y:auto;transform-origin:top right;will-change:opacity,transform;} - .session-action-menu.open-animated{animation:session-menu-in .5s cubic-bezier(.2,.8,.2,1);} + .session-action-menu.open-animated{animation:session-menu-in .45s cubic-bezier(.2,.8,.2,1);} .session-action-opt{width:100%;background:none;border:none;text-align:left;font:inherit;color:var(--text);flex-direction:row!important;gap:0!important;padding:0!important;} .session-action-opt .ws-opt-action{display:flex;flex-direction:row;align-items:center;gap:10px;width:100%;padding:10px 14px;} .session-action-opt .ws-opt-icon{color:var(--muted);transition:color .12s,opacity .12s;flex-shrink:0;display:flex;align-items:center;width:16px;} @@ -516,6 +563,7 @@ /* Hide overlay during inline rename */ .session-item:has(.session-title-input) .session-actions{display:none;} @keyframes session-menu-in{from{opacity:0;transform:translate3d(0,-4px,0) scale(.985);}to{opacity:1;transform:translate3d(0,0,0) scale(1);}} + @keyframes session-long-press{from{filter:brightness(1);}to{filter:brightness(1.08);}} @keyframes newflash{0%{background:var(--accent-bg-strong);color:var(--accent);}100%{background:transparent;color:var(--muted);}} @keyframes spin{to{transform:rotate(360deg);}} .session-item.new-flash{animation:newflash 1.4s ease-out forwards;} diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py index c4f917aa6d..64d96cc7fd 100644 --- a/tests/test_session_touch_actions.py +++ b/tests/test_session_touch_actions.py @@ -19,20 +19,23 @@ def test_session_menu_has_subtle_open_animation(): assert "function _playSessionActionMenuEntrance(menu){" in SESSIONS_JS assert "typeof menu.animate==='function'" in SESSIONS_JS assert "{opacity:0, transform:'translate3d(0,-4px,0) scale(.985)'}" in SESSIONS_JS - assert "{duration:500, easing:'cubic-bezier(.2,.8,.2,1)'}" in SESSIONS_JS + assert "{duration:450, easing:'cubic-bezier(.2,.8,.2,1)'}" in SESSIONS_JS assert "menu.classList.add('open-animated')" in SESSIONS_JS - assert ".session-action-menu.open-animated{animation:session-menu-in .5s cubic-bezier(.2,.8,.2,1);}" in STYLE_CSS + assert ".session-action-menu.open-animated{animation:session-menu-in .45s cubic-bezier(.2,.8,.2,1);}" in STYLE_CSS assert "@keyframes session-menu-in" in STYLE_CSS assert "@media (prefers-reduced-motion:reduce)" in STYLE_CSS assert ".session-action-menu{animation:none;will-change:auto;}" in STYLE_CSS def test_mobile_session_menu_opens_from_long_press_and_hides_dots(): - assert "_longPressDelay=560" in SESSIONS_JS + assert "_longPressDelay=400" in SESSIONS_JS + assert "el.classList.add('long-pressing')" in SESSIONS_JS + assert "if(!_longPressMenuOpened) el.classList.remove('long-pressing')" in SESSIONS_JS + assert "row.classList.remove('menu-open','long-pressing')" in SESSIONS_JS assert "_openSessionActionMenu(s, el)" in SESSIONS_JS assert "@media (hover:none) and (pointer:coarse)" in STYLE_CSS assert ".session-actions{display:none;}" in STYLE_CSS - assert "const _beginSessionTouchGesture=(clientX,clientY)=>{" in SESSIONS_JS + assert "const _beginSessionGesture=(clientX,clientY)=>{" in SESSIONS_JS assert "const _scheduleSessionLongPressMenu=()=>{" in SESSIONS_JS mobile_touch = STYLE_CSS[STYLE_CSS.find("@media (hover:none) and (pointer:coarse)"):STYLE_CSS.find("@media (max-width: 340px)")] assert ".session-item{padding-right:6px;}" in mobile_touch @@ -52,13 +55,61 @@ def test_open_session_menu_consumes_next_row_activation(): def test_session_swipes_archive_right_and_delete_left(): - assert "_swipeActionThreshold=96" in SESSIONS_JS + assert "_gesturePointerType!=='mouse'" in SESSIONS_JS + assert "_swipeTracking=true" in SESSIONS_JS + assert "const _trackHorizontalSwipe=(dx,dy)=>{" in SESSIONS_JS + assert "_swipeActionThreshold=144" in SESSIONS_JS + assert "_committedSwipeDuration=420" in SESSIONS_JS assert "const _handleSessionSwipe=(signedDx,signedDy)=>{" in SESSIONS_JS + assert "if(_isSessionSwipeTarget()&&(_swipeTracking||Math.abs(signedDx)>Math.abs(signedDy))) _paintSessionSwipe(signedDx)" in SESSIONS_JS + assert "if(_isSessionSwipeTarget()&&(_swipeTracking||dx>dy)) _paintSessionSwipe(signedDx)" in SESSIONS_JS assert "if(signedDx>0){" in SESSIONS_JS - assert "_archiveSession(s,true)" in SESSIONS_JS - assert "deleteSession(s.session_id)" in SESSIONS_JS + assert "_archiveSession(s,!s.archived)" in SESSIONS_JS + assert "deleteSession(s.session_id,async()=>{" in SESSIONS_JS + assert "showToast('Imported sessions cannot be deleted here.',3000);" in SESSIONS_JS + assert "_swipeHandled=false;" in SESSIONS_JS assert "if(!_isDragging&&(dx>5||dy>5))" in SESSIONS_JS - assert "_handleSessionSwipe(signedDx,signedDy)" in SESSIONS_JS + assert "const _commitSessionSwipe=()=>{" in SESSIONS_JS + assert "_commitSessionSwipe();" in SESSIONS_JS + + +def test_session_swipes_show_visual_feedback_and_touch_load_clears(): + assert "const _paintSessionSwipe=(signedDx)=>{" in SESSIONS_JS + assert "el.style.setProperty('--session-swipe-offset',offset+'px')" in SESSIONS_JS + assert "const progress=Math.min(1,Math.abs(offset)/72)" in SESSIONS_JS + assert "el.style.setProperty('--session-swipe-progress',Math.pow(progress,1.5))" in SESSIONS_JS + assert "const _clearSessionSwipePaint=()=>{" in SESSIONS_JS + assert "const _settleSessionSwipePaint=()=>{" in SESSIONS_JS + assert "const _completeSessionSwipePaint=(signedDx)=>{" in SESSIONS_JS + assert "el.classList.add('swipe-committed')" in SESSIONS_JS + assert "el.style.setProperty('--session-swipe-progress','0')" in SESSIONS_JS + assert "deleteSession(s.session_id,async()=>{" in SESSIONS_JS + assert "const archived=await _archiveSession(s,!s.archived);" in SESSIONS_JS + assert "if(!archived) _settleSessionSwipePaint();" in SESSIONS_JS + assert "await new Promise(resolve=>setTimeout(resolve,_committedSwipeDuration));" in SESSIONS_JS + assert "async function deleteSession(sid, beforeDelete=null){" in SESSIONS_JS + assert "requestAnimationFrame(()=>requestAnimationFrame(_clearSessionSwipePaint))" in SESSIONS_JS + assert ".session-item.swiping-right" in STYLE_CSS + assert ".session-item.swiping-left" in STYLE_CSS + assert "opacity:var(--session-swipe-progress,0)" in STYLE_CSS + assert "transform:translateX(calc(-1 * var(--session-swipe-offset,0px)))" in STYLE_CSS + assert STYLE_CSS.count("background:transparent;") >= 3 + assert "transform .5s cubic-bezier(.2,.8,.2,1)" in STYLE_CSS + assert ".session-item.dragging.swiping-right" in STYLE_CSS + assert ".session-item.dragging.swiping-left" in STYLE_CSS + assert ".session-item.active.swiping-right" in STYLE_CSS + assert ".session-item.active.swiping-left" in STYLE_CSS + assert 'content:"Archive"' in STYLE_CSS + assert 'content:"Delete"' in STYLE_CSS + assert ".session-item.dragging{transition:background .15s,color .15s,box-shadow .15s ease;}" in STYLE_CSS + assert ".session-item.swipe-committed" in STYLE_CSS + assert "transform .42s cubic-bezier(.2,.8,.2,1)" in STYLE_CSS + assert ".session-item.swipe-committed::after{transition:opacity .18s ease;}" in STYLE_CSS + assert ".session-item.long-pressing" in STYLE_CSS + assert "@keyframes session-long-press" in STYLE_CSS + assert "transform:translateX(var(--session-swipe-offset,0))" in STYLE_CSS + assert "finally{" in SESSIONS_JS + assert "el.classList.remove('loading');" in SESSIONS_JS def test_ios_touch_events_drive_session_swipes(): From a5254509a3a63627f96d9842dd315dc60f30c2de Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Sun, 17 May 2026 08:03:51 -0600 Subject: [PATCH 005/349] refactor implementation and clean up --- static/sessions.js | 74 ++++++++++++++--------------- tests/test_session_touch_actions.py | 6 ++- 2 files changed, 41 insertions(+), 39 deletions(-) diff --git a/static/sessions.js b/static/sessions.js index ba496d0a64..cfcd301cd8 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -3181,17 +3181,15 @@ function renderSessionListFromCache(){ // single-tap navigation. pointerup fires immediately on both mouse & touch. // Mouse clicks are instant; touch presses need a 300ms delay to distinguish // a tap from a scroll-drag gesture on mobile. - // Drag detection (pointermove > 5px) cancels the pending tap on release. + // Movement promotes pressing into dragging; drag release cancels a pending tap. let _lastTapTime=0; let _tapTimer=null; let _pointerDownX=0; let _pointerDownY=0; - let _pointerActive=false; - let _isDragging=false; + let _gestureState='idle'; // idle | pressing | dragging | committed let _clearDragTimer=null; let _longPressTimer=null; let _longPressMenuOpened=false; - let _swipeHandled=false; let _swipeTracking=false; let _pointerX=0; let _pointerY=0; @@ -3205,16 +3203,14 @@ function renderSessionListFromCache(){ if(!_longPressMenuOpened) el.classList.remove('long-pressing'); }; const _beginSessionGesture=(clientX,clientY)=>{ - _pointerActive=true; _gesturePointerType=''; _pointerDownX=clientX; _pointerDownY=clientY; _pointerX=clientX; _pointerY=clientY; - _isDragging=false; + _gestureState='pressing'; _swipeTracking=false; _longPressMenuOpened=false; - _swipeHandled=false; if(_clearDragTimer){clearTimeout(_clearDragTimer);_clearDragTimer=null;} el.classList.remove('dragging','swipe-committed'); }; @@ -3222,7 +3218,7 @@ function renderSessionListFromCache(){ _clearLongPressTimer(); el.classList.add('long-pressing'); _longPressTimer=setTimeout(()=>{ - if(!_pointerActive||_isDragging||_renamingSid||_sessionSelectMode||readOnly) return; + if(_gestureState!=='pressing'||_renamingSid||_sessionSelectMode||readOnly) return; _longPressMenuOpened=true; clearTimeout(_tapTimer); _tapTimer=null; @@ -3236,6 +3232,13 @@ function renderSessionListFromCache(){ const _trackHorizontalSwipe=(dx,dy)=>{ if(dx>16&&dx>dy*1.2) _swipeTracking=true; }; + const _promoteSessionDrag=(dx,dy)=>{ + if(_gestureState!=='pressing'||(dx<=5&&dy<=5)) return; + if(dy>8||dx>10) _clearLongPressTimer(); + _gestureState='dragging'; + el.classList.add('dragging'); + if(_clearDragTimer){clearTimeout(_clearDragTimer);_clearDragTimer=null;} + }; const _canSwipeDeleteSession=()=>{ return _isSessionSwipeTarget()&&!_isMessagingSession(s)&&!_isCliSession(s); }; @@ -3263,10 +3266,10 @@ function renderSessionListFromCache(){ el.style.setProperty('--session-swipe-offset',(signedDx>0?1:-1)*window.innerWidth+'px'); }; const _handleSessionSwipe=(signedDx,signedDy)=>{ - if(_swipeHandled||!_isSessionSwipeTarget()) return false; + if(_gestureState==='committed'||!_isSessionSwipeTarget()) return false; if(Math.abs(signedDx)<_swipeActionThreshold) return false; if(Math.abs(signedDy)>Math.abs(signedDx)*_swipeCancelRatio) return false; - _swipeHandled=true; + _gestureState='committed'; _clearLongPressTimer(); clearTimeout(_tapTimer); _tapTimer=null; @@ -3287,7 +3290,7 @@ function renderSessionListFromCache(){ }); }else if(typeof showToast==='function'){ showToast('Imported sessions cannot be deleted here.',3000); - _swipeHandled=false; + _gestureState='dragging'; _settleSessionSwipePaint(); } return true; @@ -3296,10 +3299,10 @@ function renderSessionListFromCache(){ return _handleSessionSwipe(_pointerX-_pointerDownX,_pointerY-_pointerDownY); }; const _clearPointerDragState=()=>{ - _pointerActive=false; + const wasDragging=_gestureState==='dragging'; + _gestureState='idle'; _clearLongPressTimer(); - if(_isDragging){ - _isDragging=false; + if(wasDragging){ if(_clearDragTimer){clearTimeout(_clearDragTimer);_clearDragTimer=null;} _clearDragTimer=setTimeout(()=>{_settleSessionSwipePaint();_clearDragTimer=null;},50); } @@ -3316,35 +3319,31 @@ function renderSessionListFromCache(){ // Plain hover also dispatches pointermove. Only mark a row as dragging // after an actual press starts on this row; otherwise hovered rows stay // faded until the next sidebar rerender clears their DOM nodes. - if(!_pointerActive) return; + if(_gestureState==='idle') return; _pointerX=e.clientX; _pointerY=e.clientY; const dx=Math.abs(e.clientX-_pointerDownX); const dy=Math.abs(e.clientY-_pointerDownY); - if(!_isDragging&&(dx>5||dy>5)){ - if(dy>8||dx>10) _clearLongPressTimer(); - _isDragging=true; - el.classList.add('dragging'); - // Cancel any pending drag-clear so we don't flash hover mid-drag - if(_clearDragTimer){clearTimeout(_clearDragTimer);_clearDragTimer=null;} - } + _promoteSessionDrag(dx,dy); const signedDx=e.clientX-_pointerDownX; const signedDy=e.clientY-_pointerDownY; _trackHorizontalSwipe(Math.abs(signedDx),Math.abs(signedDy)); if(_isSessionSwipeTarget()&&(_swipeTracking||Math.abs(signedDx)>Math.abs(signedDy))) _paintSessionSwipe(signedDx); }; el.onpointercancel=_clearPointerDragState; - el.onpointerleave=()=>{ if(_pointerActive) _clearPointerDragState(); }; + el.onpointerleave=()=>{ + if(_gesturePointerType==='mouse'&&_gestureState!=='idle') _clearPointerDragState(); + }; el.onpointerup=(e)=>{ if(e.pointerType==='mouse' && e.button!==0) return; // ignore right/middle click - _pointerActive=false; + const wasDragging=_gestureState==='dragging'; _clearLongPressTimer(); if(_renamingSid) return; if(actions&&actions.contains(e.target)) return; _pointerX=e.clientX; _pointerY=e.clientY; _commitSessionSwipe(); - if(_longPressMenuOpened||_swipeHandled){e.stopPropagation();return;} + if(_longPressMenuOpened||_gestureState==='committed'){e.stopPropagation();return;} if(_sessionActionMenu&&!_sessionActionMenu.contains(e.target)){ closeSessionActionMenu(); e.stopPropagation(); @@ -3353,7 +3352,13 @@ function renderSessionListFromCache(){ if(e.target&&e.target.closest&&e.target.closest('.session-child-count,.session-child-sessions,.session-child-session,.session-lineage-count,.session-lineage-segments,.session-lineage-segment')) return; if(_sessionSelectMode){e.stopPropagation();if(!readOnly)toggleSessionSelect(s.session_id);return;} // If the pointer moved enough to be a drag, cancel any pending tap - if(_isDragging){clearTimeout(_tapTimer);_tapTimer=null;_lastTapTime=0;_clearDragTimer=setTimeout(()=>{_settleSessionSwipePaint();_clearDragTimer=null;},50);return;} + if(wasDragging){ + clearTimeout(_tapTimer);_tapTimer=null;_lastTapTime=0; + _gestureState='idle'; + _clearDragTimer=setTimeout(()=>{_settleSessionSwipePaint();_clearDragTimer=null;},50); + return; + } + _gestureState='idle'; const now=Date.now(); if(now-_lastTapTime<350){ // Double-tap: rename @@ -3412,7 +3417,7 @@ function renderSessionListFromCache(){ _scheduleSessionLongPressMenu(); },{passive:true}); el.addEventListener('touchmove',(e)=>{ - if(!_pointerActive) return; + if(_gestureState==='idle') return; const touch=e.changedTouches&&e.changedTouches[0]; if(!touch) return; _pointerX=touch.clientX; @@ -3421,18 +3426,13 @@ function renderSessionListFromCache(){ const signedDy=touch.clientY-_pointerDownY; const dx=Math.abs(signedDx); const dy=Math.abs(signedDy); - if(dx>10||dy>8) _clearLongPressTimer(); - if(!_isDragging&&(dx>5||dy>5)){ - _isDragging=true; - el.classList.add('dragging'); - if(_clearDragTimer){clearTimeout(_clearDragTimer);_clearDragTimer=null;} - } + _promoteSessionDrag(dx,dy); _trackHorizontalSwipe(dx,dy); if(_isSessionSwipeTarget()&&(_swipeTracking||dx>dy)) _paintSessionSwipe(signedDx); if(_swipeTracking) e.preventDefault(); },{passive:false}); el.addEventListener('touchend',(e)=>{ - _pointerActive=false; + const wasDragging=_gestureState==='dragging'; _clearLongPressTimer(); const touch=e.changedTouches&&e.changedTouches[0]; if(touch){ @@ -3440,10 +3440,10 @@ function renderSessionListFromCache(){ _pointerY=touch.clientY; } _commitSessionSwipe(); - if(_isDragging){ - _isDragging=false; - if(!_swipeHandled) _clearDragTimer=setTimeout(()=>{_settleSessionSwipePaint();_clearDragTimer=null;},50); + if(wasDragging){ + if(_gestureState!=='committed') _clearDragTimer=setTimeout(()=>{_settleSessionSwipePaint();_clearDragTimer=null;},50); } + if(_gestureState!=='committed') _gestureState='idle'; },{passive:true}); return el; } diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py index 64d96cc7fd..edc99c8af3 100644 --- a/tests/test_session_touch_actions.py +++ b/tests/test_session_touch_actions.py @@ -67,8 +67,10 @@ def test_session_swipes_archive_right_and_delete_left(): assert "_archiveSession(s,!s.archived)" in SESSIONS_JS assert "deleteSession(s.session_id,async()=>{" in SESSIONS_JS assert "showToast('Imported sessions cannot be deleted here.',3000);" in SESSIONS_JS - assert "_swipeHandled=false;" in SESSIONS_JS - assert "if(!_isDragging&&(dx>5||dy>5))" in SESSIONS_JS + assert "let _gestureState='idle';" in SESSIONS_JS + assert "_gestureState='dragging';" in SESSIONS_JS + assert "const _promoteSessionDrag=(dx,dy)=>{" in SESSIONS_JS + assert "if(_gesturePointerType==='mouse'&&_gestureState!=='idle') _clearPointerDragState();" in SESSIONS_JS assert "const _commitSessionSwipe=()=>{" in SESSIONS_JS assert "_commitSessionSwipe();" in SESSIONS_JS From 22aae4867295217b5040936c47c7df28e780ba16 Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Sun, 17 May 2026 11:00:19 -0600 Subject: [PATCH 006/349] Polish session swipe affordances --- static/icons.js | 1 + static/sessions.js | 19 +++++++++++ static/style.css | 51 +++++++++++++++++++---------- tests/test_session_touch_actions.py | 15 ++++++--- 4 files changed, 64 insertions(+), 22 deletions(-) diff --git a/static/icons.js b/static/icons.js index 10e5eb78c6..f965f932dd 100644 --- a/static/icons.js +++ b/static/icons.js @@ -21,6 +21,7 @@ const LI_PATHS = { 'upload': '', 'braces': '', 'trash-2': '', + 'archive': '', 'settings': '', 'alert-triangle': '', 'refresh-cw': '', diff --git a/static/sessions.js b/static/sessions.js index cfcd301cd8..3903accacd 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -3175,6 +3175,25 @@ function renderSessionListFromCache(){ el.appendChild(actions); } + const _makeSessionSwipeAffordance=(side,icon,label)=>{ + const affordance=document.createElement('div'); + affordance.className='session-swipe-affordance session-swipe-affordance-'+side; + const badge=document.createElement('span'); + badge.className='session-swipe-badge'; + badge.innerHTML=li(icon,18); + const text=document.createElement('span'); + text.className='session-swipe-label'; + text.textContent=label; + affordance.append(badge,text); + return affordance; + }; + if(!readOnly){ + el.append( + _makeSessionSwipeAffordance('right',s.archived?'undo':'archive',s.archived?t('session_restore'):t('session_batch_archive')), + _makeSessionSwipeAffordance('left','trash-2',t('session_batch_delete')), + ); + } + // Use pointerup + manual double-tap detection instead of onclick/ondblclick. // onclick/ondblclick are unreliable on touch devices (iPad Safari especially): // hover-triggered layout shifts, ghost clicks, and 300ms delay all break diff --git a/static/style.css b/static/style.css index 5ac6ae79f2..a8c269d733 100644 --- a/static/style.css +++ b/static/style.css @@ -441,41 +441,58 @@ } .session-item.swiping-right{background:color-mix(in srgb,var(--warning) 18%,var(--surface));box-shadow:0 0 0 1px color-mix(in srgb,var(--warning) 60%,transparent);} .session-item.swiping-left{background:color-mix(in srgb,var(--error) 16%,var(--surface));box-shadow:0 0 0 1px color-mix(in srgb,var(--error) 60%,transparent);} - .session-item.swiping-right::after,.session-item.swiping-left::after{ + .session-swipe-affordance{ position:absolute; top:0; bottom:0; display:flex; + flex-direction:column; align-items:center; + justify-content:center; + gap:3px; width:72px; padding:0 10px; box-sizing:border-box; - opacity:var(--session-swipe-progress,0); - font-size:10px; - font-weight:700; - letter-spacing:.06em; - text-transform:uppercase; + opacity:0; + transform:translateX(calc(-1 * var(--session-swipe-offset,0px))) scale(calc(.82 + var(--session-swipe-progress,0) * .18)); + transform-origin:center; pointer-events:none; } - .session-item.swiping-right::after{ - content:"Archive"; + .session-swipe-affordance-right{ left:0; - justify-content:flex-start; - transform:translateX(calc(-1 * var(--session-swipe-offset,0px))); color:var(--warning); - background:transparent; } - .session-item.swiping-left::after{ - content:"Delete"; + .session-swipe-affordance-left{ right:0; - justify-content:flex-end; - transform:translateX(calc(-1 * var(--session-swipe-offset,0px))); color:var(--error); - background:transparent; + } + .session-item.swiping-right .session-swipe-affordance-right, + .session-item.swiping-left .session-swipe-affordance-left{ + opacity:var(--session-swipe-progress,0); + } + .session-swipe-badge{ + width:30px; + height:30px; + border-radius:999px; + display:flex; + align-items:center; + justify-content:center; + color:#fff; + } + .session-swipe-affordance-right .session-swipe-badge{background:var(--warning);} + .session-swipe-affordance-left .session-swipe-badge{background:var(--error);} + .session-swipe-label{ + max-width:58px; + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap; + font-size:10px; + font-weight:600; + line-height:1; } .session-item.dragging{transition:background .15s,color .15s,box-shadow .15s ease;} .session-item.swipe-committed{transition:background .15s,color .15s,transform .42s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;} - .session-item.swipe-committed::after{transition:opacity .18s ease;} + .session-item.swipe-committed .session-swipe-affordance{transition:opacity .18s ease,transform .18s ease;} /* Suppress hover highlight during drag to avoid visual noise mid-scroll */ .session-item.dragging:hover{background:transparent;color:var(--muted);} .session-item.dragging.swiping-right{background:color-mix(in srgb,var(--warning) 18%,var(--surface));} diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py index edc99c8af3..1843adec00 100644 --- a/tests/test_session_touch_actions.py +++ b/tests/test_session_touch_actions.py @@ -93,20 +93,25 @@ def test_session_swipes_show_visual_feedback_and_touch_load_clears(): assert "requestAnimationFrame(()=>requestAnimationFrame(_clearSessionSwipePaint))" in SESSIONS_JS assert ".session-item.swiping-right" in STYLE_CSS assert ".session-item.swiping-left" in STYLE_CSS + assert "const _makeSessionSwipeAffordance=(side,icon,label)=>{" in SESSIONS_JS + assert "_makeSessionSwipeAffordance('right',s.archived?'undo':'archive'" in SESSIONS_JS + assert "_makeSessionSwipeAffordance('left','trash-2'" in SESSIONS_JS + assert ".session-swipe-affordance{" in STYLE_CSS assert "opacity:var(--session-swipe-progress,0)" in STYLE_CSS - assert "transform:translateX(calc(-1 * var(--session-swipe-offset,0px)))" in STYLE_CSS - assert STYLE_CSS.count("background:transparent;") >= 3 + assert ".session-item.swiping-right .session-swipe-affordance-right" in STYLE_CSS + assert ".session-item.swiping-left .session-swipe-affordance-left" in STYLE_CSS + assert "transform:translateX(calc(-1 * var(--session-swipe-offset,0px))) scale(calc(.82 + var(--session-swipe-progress,0) * .18))" in STYLE_CSS + assert ".session-swipe-badge{" in STYLE_CSS + assert ".session-swipe-label{" in STYLE_CSS assert "transform .5s cubic-bezier(.2,.8,.2,1)" in STYLE_CSS assert ".session-item.dragging.swiping-right" in STYLE_CSS assert ".session-item.dragging.swiping-left" in STYLE_CSS assert ".session-item.active.swiping-right" in STYLE_CSS assert ".session-item.active.swiping-left" in STYLE_CSS - assert 'content:"Archive"' in STYLE_CSS - assert 'content:"Delete"' in STYLE_CSS assert ".session-item.dragging{transition:background .15s,color .15s,box-shadow .15s ease;}" in STYLE_CSS assert ".session-item.swipe-committed" in STYLE_CSS assert "transform .42s cubic-bezier(.2,.8,.2,1)" in STYLE_CSS - assert ".session-item.swipe-committed::after{transition:opacity .18s ease;}" in STYLE_CSS + assert ".session-item.swipe-committed .session-swipe-affordance{transition:opacity .18s ease,transform .18s ease;}" in STYLE_CSS assert ".session-item.long-pressing" in STYLE_CSS assert "@keyframes session-long-press" in STYLE_CSS assert "transform:translateX(var(--session-swipe-offset,0))" in STYLE_CSS From 587101fb97c32b0a53b8512e545e9ecc41534100 Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Sun, 17 May 2026 11:55:56 -0600 Subject: [PATCH 007/349] Animate session list reflow on removal --- static/sessions.js | 45 +++++++++++++++++++++++++++-- static/style.css | 9 ++++++ tests/test_session_touch_actions.py | 17 +++++++++++ 3 files changed, 69 insertions(+), 2 deletions(-) diff --git a/static/sessions.js b/static/sessions.js index 3903accacd..6c5cab5dbd 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -1303,6 +1303,38 @@ const _lineageReportCache = new Map(); const _lineageReportInflight = new Map(); let _lineageReportCacheGeneration = 0; let _sessionVisibleSidebarIds = []; +let _pendingSessionReflowPositions = null; + +function _captureSessionReflowPositions(){ + const list=$('sessionList'); + if(!list) return null; + const positions=new Map(); + list.querySelectorAll('.session-item[data-sid]').forEach(row=>{ + positions.set(row.dataset.sid,row.getBoundingClientRect().top); + }); + return positions; +} + +function _playQueuedSessionReflowAnimation(){ + const before=_pendingSessionReflowPositions; + _pendingSessionReflowPositions=null; + if(!before||!before.size) return; + const reduce=window.matchMedia&&window.matchMedia('(prefers-reduced-motion: reduce)').matches; + if(reduce) return; + const list=$('sessionList'); + if(!list) return; + list.querySelectorAll('.session-item[data-sid]').forEach(row=>{ + const oldTop=before.get(row.dataset.sid); + if(oldTop===undefined) return; + const delta=oldTop-row.getBoundingClientRect().top; + if(Math.abs(delta)<1||typeof row.animate!=='function') return; + const anim=row.animate( + [{transform:`translateY(${delta}px)`},{transform:'translateY(0)'}], + {duration:360,easing:'cubic-bezier(.2,.8,.2,1)'} + ); + if(anim&&anim.finished) anim.finished.catch(()=>{}); + }); +} const SESSION_VIRTUAL_ROW_HEIGHT = 52; const SESSION_VIRTUAL_BUFFER_ROWS = 12; const SESSION_VIRTUAL_THRESHOLD_ROWS = 80; @@ -1609,14 +1641,16 @@ function _playSessionActionMenuEntrance(menu){ async function _archiveSession(session, archived=true){ if(_isReadOnlySession(session)){ if(typeof showToast==='function') showToast('Read-only imported sessions cannot be modified.',3000); return false; } + const reflowPositions=_captureSessionReflowPositions(); try{ const response=await api('/api/session/archive',{method:'POST',body:JSON.stringify({session_id:session.session_id,archived})}); session.archived=archived; if(S.session&&S.session.session_id===session.session_id) S.session.archived=archived; + _pendingSessionReflowPositions=reflowPositions; await renderSessionList(); showToast(session.archived?_sessionArchiveToast(response,session):t('session_restored')); return true; - }catch(err){showToast(t('session_archive_failed')+err.message);return false;} + }catch(err){_pendingSessionReflowPositions=null;showToast(t('session_archive_failed')+err.message);return false;} } function _openSessionActionMenu(session, anchorEl){ @@ -2841,6 +2875,7 @@ function renderSessionListFromCache(){ toggleBtn.onclick=(e)=>{e.stopPropagation();toggleSessionSelectMode();}; list.appendChild(toggleBtn); } + _playQueuedSessionReflowAnimation(); // Note: declared after the groups loop but available via function hoisting. function _renderOneSession(s, isPinnedGroup=false){ const el=document.createElement('div'); @@ -3283,6 +3318,10 @@ function renderSessionListFromCache(){ el.classList.add('swipe-committed'); el.style.setProperty('--session-swipe-progress','0'); el.style.setProperty('--session-swipe-offset',(signedDx>0?1:-1)*window.innerWidth+'px'); + const rect=el.getBoundingClientRect(); + el.style.height=rect.height+'px'; + el.style.minHeight=rect.height+'px'; + requestAnimationFrame(()=>el.classList.add('swipe-removing')); }; const _handleSessionSwipe=(signedDx,signedDy)=>{ if(_gestureState==='committed'||!_isSessionSwipeTarget()) return false; @@ -3575,12 +3614,13 @@ async function deleteSession(sid, beforeDelete=null){ danger:true }); if(!ok)return false; + const reflowPositions=_captureSessionReflowPositions(); if(beforeDelete) await beforeDelete(); let response=null; try{ response=await api('/api/session/delete',{method:'POST',body:JSON.stringify({session_id:sid})}); _clearHandoffStorageForSession(sid); - }catch(e){setStatus(`Delete failed: ${e.message}`);return false;} + }catch(e){_pendingSessionReflowPositions=null;setStatus(`Delete failed: ${e.message}`);return false;} if(S.session&&S.session.session_id===sid){ S.session=null;S.messages=[];S.entries=[]; localStorage.removeItem('hermes-webui-session'); @@ -3599,6 +3639,7 @@ async function deleteSession(sid, beforeDelete=null){ } } showToast(_sessionResponseRetainsWorktree(response,session)?t('session_deleted_worktree'):t('session_deleted')); + _pendingSessionReflowPositions=reflowPositions; await renderSessionList(); return true; } diff --git a/static/style.css b/static/style.css index a8c269d733..73c10f0384 100644 --- a/static/style.css +++ b/static/style.css @@ -492,6 +492,15 @@ } .session-item.dragging{transition:background .15s,color .15s,box-shadow .15s ease;} .session-item.swipe-committed{transition:background .15s,color .15s,transform .42s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;} + .session-item.swipe-removing{ + min-height:0!important; + height:0!important; + margin-bottom:0; + padding-top:0; + padding-bottom:0; + overflow:hidden; + transition:background .15s,color .15s,transform .42s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease,height .36s cubic-bezier(.2,.8,.2,1),min-height .36s cubic-bezier(.2,.8,.2,1),margin-bottom .36s cubic-bezier(.2,.8,.2,1),padding-top .36s cubic-bezier(.2,.8,.2,1),padding-bottom .36s cubic-bezier(.2,.8,.2,1); + } .session-item.swipe-committed .session-swipe-affordance{transition:opacity .18s ease,transform .18s ease;} /* Suppress hover highlight during drag to avoid visual noise mid-scroll */ .session-item.dragging:hover{background:transparent;color:var(--muted);} diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py index 1843adec00..4b88685d87 100644 --- a/tests/test_session_touch_actions.py +++ b/tests/test_session_touch_actions.py @@ -84,6 +84,8 @@ def test_session_swipes_show_visual_feedback_and_touch_load_clears(): assert "const _settleSessionSwipePaint=()=>{" in SESSIONS_JS assert "const _completeSessionSwipePaint=(signedDx)=>{" in SESSIONS_JS assert "el.classList.add('swipe-committed')" in SESSIONS_JS + assert "el.style.height=rect.height+'px'" in SESSIONS_JS + assert "requestAnimationFrame(()=>el.classList.add('swipe-removing'))" in SESSIONS_JS assert "el.style.setProperty('--session-swipe-progress','0')" in SESSIONS_JS assert "deleteSession(s.session_id,async()=>{" in SESSIONS_JS assert "const archived=await _archiveSession(s,!s.archived);" in SESSIONS_JS @@ -110,6 +112,8 @@ def test_session_swipes_show_visual_feedback_and_touch_load_clears(): assert ".session-item.active.swiping-left" in STYLE_CSS assert ".session-item.dragging{transition:background .15s,color .15s,box-shadow .15s ease;}" in STYLE_CSS assert ".session-item.swipe-committed" in STYLE_CSS + assert ".session-item.swipe-removing{" in STYLE_CSS + assert "height .36s cubic-bezier(.2,.8,.2,1)" in STYLE_CSS assert "transform .42s cubic-bezier(.2,.8,.2,1)" in STYLE_CSS assert ".session-item.swipe-committed .session-swipe-affordance{transition:opacity .18s ease,transform .18s ease;}" in STYLE_CSS assert ".session-item.long-pressing" in STYLE_CSS @@ -119,6 +123,19 @@ def test_session_swipes_show_visual_feedback_and_touch_load_clears(): assert "el.classList.remove('loading');" in SESSIONS_JS +def test_session_removal_reflows_surviving_rows_smoothly(): + assert "let _pendingSessionReflowPositions = null;" in SESSIONS_JS + assert "function _captureSessionReflowPositions(){" in SESSIONS_JS + assert "positions.set(row.dataset.sid,row.getBoundingClientRect().top);" in SESSIONS_JS + assert "function _playQueuedSessionReflowAnimation(){" in SESSIONS_JS + assert "window.matchMedia('(prefers-reduced-motion: reduce)').matches" in SESSIONS_JS + assert "const delta=oldTop-row.getBoundingClientRect().top;" in SESSIONS_JS + assert "{duration:360,easing:'cubic-bezier(.2,.8,.2,1)'}" in SESSIONS_JS + assert SESSIONS_JS.count("const reflowPositions=_captureSessionReflowPositions();") >= 2 + assert SESSIONS_JS.count("_pendingSessionReflowPositions=reflowPositions;") >= 2 + assert "_playQueuedSessionReflowAnimation();" in SESSIONS_JS + + def test_ios_touch_events_drive_session_swipes(): assert "el.addEventListener('touchstart'" in SESSIONS_JS assert "el.addEventListener('touchmove'" in SESSIONS_JS From 5db7aa43aab0164d3886caa4b2f0a69a5ed4eabc Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Sun, 17 May 2026 12:02:56 -0600 Subject: [PATCH 008/349] smooth flip animation on delete/archive for session stack --- static/sessions.js | 34 +++++++++++++++++++++-------- static/style.css | 5 ++++- tests/test_session_touch_actions.py | 11 +++++++--- 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/static/sessions.js b/static/sessions.js index 6c5cab5dbd..710a7e386e 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -1319,7 +1319,7 @@ function _playQueuedSessionReflowAnimation(){ const before=_pendingSessionReflowPositions; _pendingSessionReflowPositions=null; if(!before||!before.size) return; - const reduce=window.matchMedia&&window.matchMedia('(prefers-reduced-motion: reduce)').matches; + const reduce=_sessionPrefersReducedMotion(); if(reduce) return; const list=$('sessionList'); if(!list) return; @@ -1327,14 +1327,30 @@ function _playQueuedSessionReflowAnimation(){ const oldTop=before.get(row.dataset.sid); if(oldTop===undefined) return; const delta=oldTop-row.getBoundingClientRect().top; - if(Math.abs(delta)<1||typeof row.animate!=='function') return; - const anim=row.animate( - [{transform:`translateY(${delta}px)`},{transform:'translateY(0)'}], - {duration:360,easing:'cubic-bezier(.2,.8,.2,1)'} - ); - if(anim&&anim.finished) anim.finished.catch(()=>{}); + if(Math.abs(delta)<1) return; + row.style.setProperty('--session-reflow-offset',delta+'px'); + row.classList.add('session-reflowing'); + row.getBoundingClientRect(); + row.style.setProperty('--session-reflow-offset','0px'); + let reflowCleared=false; + const clearReflow=()=>{ + if(reflowCleared) return; + reflowCleared=true; + row.classList.remove('session-reflowing'); + row.style.removeProperty('--session-reflow-offset'); + row.removeEventListener('transitionend',onReflowEnd); + }; + const onReflowEnd=(event)=>{ + if(event.propertyName==='transform') clearReflow(); + }; + row.addEventListener('transitionend',onReflowEnd); + setTimeout(clearReflow,420); }); } + +function _sessionPrefersReducedMotion(){ + return Boolean(window.matchMedia&&window.matchMedia('(prefers-reduced-motion: reduce)').matches); +} const SESSION_VIRTUAL_ROW_HEIGHT = 52; const SESSION_VIRTUAL_BUFFER_ROWS = 12; const SESSION_VIRTUAL_THRESHOLD_ROWS = 80; @@ -1621,7 +1637,7 @@ function _appendSessionDuplicateAction(menu, session){ function _playSessionActionMenuEntrance(menu){ if(!menu) return; - const reduce=window.matchMedia&&window.matchMedia('(prefers-reduced-motion: reduce)').matches; + const reduce=_sessionPrefersReducedMotion(); if(reduce) return; if(typeof menu.animate==='function'){ try{ @@ -3251,7 +3267,7 @@ function renderSessionListFromCache(){ const _longPressDelay=400; const _swipeActionThreshold=144; const _swipeCancelRatio=0.75; - const _committedSwipeDuration=420; + const _committedSwipeDuration=_sessionPrefersReducedMotion()?0:420; const _clearLongPressTimer=()=>{ if(_longPressTimer){clearTimeout(_longPressTimer);_longPressTimer=null;} if(!_longPressMenuOpened) el.classList.remove('long-pressing'); diff --git a/static/style.css b/static/style.css index 73c10f0384..bfdc54be2c 100644 --- a/static/style.css +++ b/static/style.css @@ -429,7 +429,7 @@ and attention indicator (26x26 at right:6px) still need 40px reserved when they're visible — covered by the hover / streaming / unread / menu-open / focus-within rule below. */ - .session-item{padding:8px 8px;margin-bottom:2px;border-radius:8px;cursor:pointer;font-size:13px;color:var(--muted);transition:background .15s,color .15s,transform .5s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;display:flex;align-items:flex-start;gap:8px;min-width:0;position:relative;touch-action:pan-y;-webkit-tap-highlight-color:transparent;user-select:none;-webkit-user-select:none;-webkit-touch-callout:none;transform:translateX(var(--session-swipe-offset,0));} + .session-item{padding:8px 8px;margin-bottom:2px;border-radius:8px;cursor:pointer;font-size:13px;color:var(--muted);transition:background .15s,color .15s,transform .5s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;display:flex;align-items:flex-start;gap:8px;min-width:0;position:relative;touch-action:pan-y;-webkit-tap-highlight-color:transparent;user-select:none;-webkit-user-select:none;-webkit-touch-callout:none;transform:translateX(var(--session-swipe-offset,0)) translateY(var(--session-reflow-offset,0));} .session-item.streaming,.session-item.unread,.session-item:focus-within,.session-item.menu-open{padding-right:40px;} @media (hover:hover){.session-item:hover{background:var(--hover-bg);color:var(--text);}} .session-item.loading{background:var(--hover-bg);color:var(--text);} @@ -491,6 +491,7 @@ line-height:1; } .session-item.dragging{transition:background .15s,color .15s,box-shadow .15s ease;} + .session-item.session-reflowing{transition:background .15s,color .15s,transform .36s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;will-change:transform;} .session-item.swipe-committed{transition:background .15s,color .15s,transform .42s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;} .session-item.swipe-removing{ min-height:0!important; @@ -585,6 +586,8 @@ .session-action-opt.danger .ws-opt-icon,.session-action-opt.danger .ws-opt-name{color:var(--error);} @media (prefers-reduced-motion:reduce){ .session-action-menu{animation:none;will-change:auto;} + .session-item,.session-item.session-reflowing,.session-item.swipe-committed,.session-item.swipe-removing{transition:none;} + .session-item.long-pressing{animation:none;} } /* Hide overlay during inline rename */ .session-item:has(.session-title-input) .session-actions{display:none;} diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py index 4b88685d87..ee4363565b 100644 --- a/tests/test_session_touch_actions.py +++ b/tests/test_session_touch_actions.py @@ -25,6 +25,8 @@ def test_session_menu_has_subtle_open_animation(): assert "@keyframes session-menu-in" in STYLE_CSS assert "@media (prefers-reduced-motion:reduce)" in STYLE_CSS assert ".session-action-menu{animation:none;will-change:auto;}" in STYLE_CSS + assert ".session-item,.session-item.session-reflowing,.session-item.swipe-committed,.session-item.swipe-removing{transition:none;}" in STYLE_CSS + assert ".session-item.long-pressing{animation:none;}" in STYLE_CSS def test_mobile_session_menu_opens_from_long_press_and_hides_dots(): @@ -59,7 +61,7 @@ def test_session_swipes_archive_right_and_delete_left(): assert "_swipeTracking=true" in SESSIONS_JS assert "const _trackHorizontalSwipe=(dx,dy)=>{" in SESSIONS_JS assert "_swipeActionThreshold=144" in SESSIONS_JS - assert "_committedSwipeDuration=420" in SESSIONS_JS + assert "_committedSwipeDuration=_sessionPrefersReducedMotion()?0:420" in SESSIONS_JS assert "const _handleSessionSwipe=(signedDx,signedDy)=>{" in SESSIONS_JS assert "if(_isSessionSwipeTarget()&&(_swipeTracking||Math.abs(signedDx)>Math.abs(signedDy))) _paintSessionSwipe(signedDx)" in SESSIONS_JS assert "if(_isSessionSwipeTarget()&&(_swipeTracking||dx>dy)) _paintSessionSwipe(signedDx)" in SESSIONS_JS @@ -128,12 +130,15 @@ def test_session_removal_reflows_surviving_rows_smoothly(): assert "function _captureSessionReflowPositions(){" in SESSIONS_JS assert "positions.set(row.dataset.sid,row.getBoundingClientRect().top);" in SESSIONS_JS assert "function _playQueuedSessionReflowAnimation(){" in SESSIONS_JS - assert "window.matchMedia('(prefers-reduced-motion: reduce)').matches" in SESSIONS_JS + assert "function _sessionPrefersReducedMotion(){" in SESSIONS_JS assert "const delta=oldTop-row.getBoundingClientRect().top;" in SESSIONS_JS - assert "{duration:360,easing:'cubic-bezier(.2,.8,.2,1)'}" in SESSIONS_JS + assert "row.style.setProperty('--session-reflow-offset',delta+'px')" in SESSIONS_JS + assert "row.classList.add('session-reflowing')" in SESSIONS_JS + assert "row.style.setProperty('--session-reflow-offset','0px')" in SESSIONS_JS assert SESSIONS_JS.count("const reflowPositions=_captureSessionReflowPositions();") >= 2 assert SESSIONS_JS.count("_pendingSessionReflowPositions=reflowPositions;") >= 2 assert "_playQueuedSessionReflowAnimation();" in SESSIONS_JS + assert ".session-item.session-reflowing{transition:background .15s,color .15s,transform .36s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;will-change:transform;}" in STYLE_CSS def test_ios_touch_events_drive_session_swipes(): From a902bfb9053e29958d8c36ae185bb936d40b9c72 Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Sun, 17 May 2026 12:33:48 -0600 Subject: [PATCH 009/349] let session swipes continue past action reveal --- static/sessions.js | 7 +++++-- tests/test_session_touch_actions.py | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/static/sessions.js b/static/sessions.js index 710a7e386e..7c6da6a149 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -3313,8 +3313,11 @@ function renderSessionListFromCache(){ return _isSessionSwipeTarget()&&!_isMessagingSession(s)&&!_isCliSession(s); }; const _paintSessionSwipe=(signedDx)=>{ - const offset=Math.max(-72,Math.min(72,signedDx*.55)); - const progress=Math.min(1,Math.abs(offset)/72); + const rawOffset=signedDx*.55; + const revealedOffset=Math.max(-72,Math.min(72,rawOffset)); + const overshoot=Math.max(0,Math.abs(rawOffset)-72); + const offset=Math.sign(rawOffset)*(Math.abs(revealedOffset)+Math.sqrt(overshoot)*5); + const progress=Math.min(1,Math.abs(revealedOffset)/72); el.style.setProperty('--session-swipe-offset',offset+'px'); el.style.setProperty('--session-swipe-progress',Math.pow(progress,1.5)); el.classList.toggle('swiping-right',offset>0); diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py index ee4363565b..8e373fd515 100644 --- a/tests/test_session_touch_actions.py +++ b/tests/test_session_touch_actions.py @@ -79,8 +79,12 @@ def test_session_swipes_archive_right_and_delete_left(): def test_session_swipes_show_visual_feedback_and_touch_load_clears(): assert "const _paintSessionSwipe=(signedDx)=>{" in SESSIONS_JS + assert "const rawOffset=signedDx*.55" in SESSIONS_JS + assert "const revealedOffset=Math.max(-72,Math.min(72,rawOffset))" in SESSIONS_JS + assert "const overshoot=Math.max(0,Math.abs(rawOffset)-72)" in SESSIONS_JS + assert "Math.sqrt(overshoot)*5" in SESSIONS_JS assert "el.style.setProperty('--session-swipe-offset',offset+'px')" in SESSIONS_JS - assert "const progress=Math.min(1,Math.abs(offset)/72)" in SESSIONS_JS + assert "const progress=Math.min(1,Math.abs(revealedOffset)/72)" in SESSIONS_JS assert "el.style.setProperty('--session-swipe-progress',Math.pow(progress,1.5))" in SESSIONS_JS assert "const _clearSessionSwipePaint=()=>{" in SESSIONS_JS assert "const _settleSessionSwipePaint=()=>{" in SESSIONS_JS From ab3fd4ceca4a1a4bd313325b699a233da03ed53e Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Sun, 17 May 2026 12:54:11 -0600 Subject: [PATCH 010/349] Update hover regression for gesture state machine --- tests/test_issue856_pinned_indicator_layout.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_issue856_pinned_indicator_layout.py b/tests/test_issue856_pinned_indicator_layout.py index 93b2d6440d..09785d40fb 100644 --- a/tests/test_issue856_pinned_indicator_layout.py +++ b/tests/test_issue856_pinned_indicator_layout.py @@ -118,10 +118,10 @@ def test_timestamp_hidden_when_attention_state_is_present(): def test_plain_mouse_hover_does_not_mark_session_row_dragging(): """Pointermove fires during ordinary hover; drag styling must require an active press.""" - assert "let _pointerActive=false;" in SESSIONS_JS - assert "_pointerActive=true;" in SESSIONS_JS - assert "if(!_pointerActive) return;" in SESSIONS_JS - assert "_pointerActive=false;" in SESSIONS_JS + assert "let _gestureState='idle';" in SESSIONS_JS + assert "_gestureState='pressing';" in SESSIONS_JS + assert "if(_gestureState==='idle') return;" in SESSIONS_JS + assert "_gestureState='idle';" in SESSIONS_JS assert ".session-item.dragging:hover" in STYLE_CSS From a48e47dd1cd53115eccdd802461df1ebb6a63d15 Mon Sep 17 00:00:00 2001 From: Michael Lam Date: Sun, 17 May 2026 20:40:20 -0700 Subject: [PATCH 011/349] feat: separate CLI sessions in sidebar --- CHANGELOG.md | 4 ++ docs/pr-media/2351/after-source-tabs.png | Bin 0 -> 2355 bytes docs/pr-media/2351/before-cli-mixed.png | Bin 0 -> 2355 bytes static/sessions.js | 59 +++++++++++++++++- static/style.css | 5 ++ ...est_issue2351_cli_session_source_filter.py | 31 +++++++++ 6 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 docs/pr-media/2351/after-source-tabs.png create mode 100644 docs/pr-media/2351/before-cli-mixed.png create mode 100644 tests/test_issue2351_cli_session_source_filter.py diff --git a/CHANGELOG.md b/CHANGELOG.md index ed15eec371..04bf9c79da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [Unreleased] +### Added + +- **PR #2506** by @Michaelyklam (refs #2351) — Add a read-only WebUI/CLI session source switch in the chat sidebar when agent session sync is enabled. WebUI conversations stay in the default list, while imported CLI/agent sessions are surfaced under a separate `CLI sessions` tab with counts so large CLI histories do not clutter the normal conversation list. + ## [v0.51.91] — 2026-05-18 — Release BO (stage-384 — 5-PR full sweep batch — reasoning-replay history fix + archive-extract per-session inbox + fallback streaming warnings + sanitized custom-provider env hints + Slice 3c queue/goal adapter routing) ### Fixed diff --git a/docs/pr-media/2351/after-source-tabs.png b/docs/pr-media/2351/after-source-tabs.png new file mode 100644 index 0000000000000000000000000000000000000000..2279fd3004940274c8e3f47d4f10930c3f6cf87a GIT binary patch literal 2355 zcmeAS@N?(olHy`uVBq!ia0y~yU~FSxV7kD;1Qe0J>u{8Tf#Zdzi(^Q|oHtht1sN20 z7&gisk7E8I-qkBFB)D^TK7-Ubh7=7>jzA%SMJfs|o(>(88U$1s6}_08rm(b(N{j{x zrHR2nb~G)GX0OqLWwb~gtz|~*SDLjfJ~1*d{Qp0H!p|4LrVksa&BM&lBE@=rfyVu5 PKoJH{S3j3^P6u{8Tf#Zdzi(^Q|oHtht1sN20 z7&gisk7E8I-qkBFB)D^TK7-Ubh7=7>jzA%SMJfs|o(>(88U$1s6}_08rm(b(N{j{x zrHR2nb~G)GX0OqLWwb~gtz|~*SDLjfJ~1*d{Qp0H!p|4LrVksa&BM&lBE@=rfyVu5 PKoJH{S3j3^P60) ); + const webuiSessionCount = withMessages.filter(s=>!_isCliSession(s)).length; + const cliSessionCount = withMessages.filter(s=>_isCliSession(s)).length; + if(_sessionSourceFilter==='cli' && !window._showCliSessions && cliSessionCount===0){ + _sessionSourceFilter='webui'; + } + const sourceFiltered = _sessionSourceFilter==='cli' + ? withMessages.filter(s=>_isCliSession(s)) + : withMessages.filter(s=>!_isCliSession(s)); // The server is authoritative for profile scoping (#1611): it filters by // active profile when no query param is set, and returns the aggregate when // we send ?all_profiles=1. The renamed-root cross-alias (a row tagged @@ -2733,7 +2766,7 @@ function renderSessionListFromCache(){ // in _profiles_match, and a strict-equality client filter would reject those // rows incorrectly. So we trust the wire data and skip the redundant client // filter entirely. - const profileFiltered=withMessages; + const profileFiltered=sourceFiltered; // Filter by active project. NO_PROJECT_FILTER sentinel asks for sessions // with no project_id; otherwise filter to the matching project_id, or // pass through when no filter is active. @@ -2768,6 +2801,21 @@ function renderSessionListFromCache(){ list.appendChild(batchBar); if(_sessionSelectMode&&_selectedSessions.size>0){batchBar.style.display='flex';_renderBatchActionBar();} else{batchBar.style.display='none';} + if(window._showCliSessions || cliSessionCount>0){ + const sourceTabs=document.createElement('div'); + sourceTabs.className='session-source-tabs'; + for(const filter of ['webui','cli']){ + const count=filter==='cli'?cliSessionCount:webuiSessionCount; + const btn=document.createElement('button'); + btn.type='button'; + btn.className='session-source-tab'+(_sessionSourceFilter===filter?' active':''); + btn.textContent=_sessionSourceLabel(filter,count); + btn.setAttribute('aria-pressed', _sessionSourceFilter===filter?'true':'false'); + btn.onclick=()=>_setSessionSourceFilter(filter); + sourceTabs.appendChild(btn); + } + list.appendChild(sourceTabs); + } // Project filter bar — show when there are real projects OR there are // unassigned sessions (so the Unassigned chip has something to filter to). const hasUnprojected=profileFiltered.some(s=>!s.project_id); @@ -2850,9 +2898,14 @@ function renderSessionListFromCache(){ list.appendChild(toggle); } // Empty state for active project filter - if(_activeProject&&sessions.length===0){ + if(_sessionSourceFilter==='cli'&&sessions.length===0){ + const empty=document.createElement('div'); + empty.className='session-empty-note'; + empty.textContent=window._showCliSessions?'No CLI sessions found.':'Enable Show agent sessions in Settings to list CLI sessions here.'; + list.appendChild(empty); + } else if(_activeProject&&sessions.length===0){ const empty=document.createElement('div'); - empty.style.cssText='padding:20px 14px;color:var(--muted);font-size:12px;text-align:center;opacity:.7;'; + empty.className='session-empty-note'; empty.textContent=_activeProject===NO_PROJECT_FILTER?'No unassigned sessions.':'No sessions in this project yet.'; list.appendChild(empty); } diff --git a/static/style.css b/static/style.css index e4714e214b..0921d97c44 100644 --- a/static/style.css +++ b/static/style.css @@ -3024,6 +3024,11 @@ main.main.showing-logs > #mainLogs{display:flex;} .mermaid-rendered svg{max-width:100%;height:auto;} /* ── Session projects ── */ +.session-source-tabs{display:flex;gap:4px;padding:4px 10px 8px;flex-shrink:0;} +.session-source-tab{flex:1;min-width:0;border:1px solid var(--border2);border-radius:10px;background:var(--input-bg);color:var(--muted);font-size:10px;font-weight:700;line-height:1.2;padding:5px 6px;cursor:pointer;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;transition:background .15s,color .15s,border-color .15s;} +.session-source-tab:hover{background:rgba(255,255,255,.08);color:var(--text);} +.session-source-tab.active{background:var(--accent-bg);color:var(--accent-text);border-color:var(--accent-bg);} +.session-empty-note{padding:20px 14px;color:var(--muted);font-size:12px;text-align:center;opacity:.7;} .project-bar{display:flex;gap:4px;padding:4px 10px 8px;flex-wrap:wrap;align-items:center;flex-shrink:0;} .project-chip{font-size:10px;font-weight:600;padding:3px 8px;border-radius:12px;cursor:pointer;border:1px solid var(--border2);background:var(--input-bg);color:var(--muted);transition:all .15s;white-space:nowrap;display:inline-flex;align-items:center;gap:4px;} .project-chip:hover{background:rgba(255,255,255,.08);color:var(--text);} diff --git a/tests/test_issue2351_cli_session_source_filter.py b/tests/test_issue2351_cli_session_source_filter.py new file mode 100644 index 0000000000..efe2a8f68b --- /dev/null +++ b/tests/test_issue2351_cli_session_source_filter.py @@ -0,0 +1,31 @@ +"""Regression coverage for issue #2351 CLI session list separation.""" +from pathlib import Path + +ROOT = Path(__file__).resolve().parents[1] +SESSIONS_JS = ROOT / "static" / "sessions.js" +STYLE_CSS = ROOT / "static" / "style.css" + + +def test_sidebar_has_separate_webui_and_cli_session_source_tabs(): + src = SESSIONS_JS.read_text(encoding="utf-8") + assert "let _sessionSourceFilter = 'webui'" in src + assert "hermes-session-source-filter" in src + assert "session-source-tabs" in src + assert "WebUI sessions" in src + assert "CLI sessions" in src + assert "_sessionSourceFilter==='cli'" in src + + +def test_cli_filter_keeps_cli_rows_out_of_default_webui_list(): + src = SESSIONS_JS.read_text(encoding="utf-8") + assert "const webuiSessionCount = withMessages.filter(s=>!_isCliSession(s)).length" in src + assert "const cliSessionCount = withMessages.filter(s=>_isCliSession(s)).length" in src + assert "? withMessages.filter(s=>_isCliSession(s))" in src + assert ": withMessages.filter(s=>!_isCliSession(s))" in src + + +def test_session_source_tabs_have_dedicated_sidebar_styles(): + css = STYLE_CSS.read_text(encoding="utf-8") + assert ".session-source-tabs" in css + assert ".session-source-tab.active" in css + assert ".session-empty-note" in css From ca6736407e34b821efab01bbcbc921e770d1fc8e Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Wed, 20 May 2026 21:24:35 -0600 Subject: [PATCH 012/349] Checkpoint polished session swipe interactions --- static/sessions.js | 184 +++++++++++++++------------- static/style.css | 42 ++++--- tests/test_session_touch_actions.py | 73 ++++++++--- 3 files changed, 183 insertions(+), 116 deletions(-) diff --git a/static/sessions.js b/static/sessions.js index 3b13b19503..836f2c8c96 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -3615,6 +3615,9 @@ function renderSessionListFromCache(){ menuBtn.setAttribute('aria-haspopup','menu'); menuBtn.setAttribute('aria-label','Conversation actions'); menuBtn.innerHTML=ICONS.more; + const stopMenuPointer=(e)=>e.stopPropagation(); + menuBtn.onpointerdown=stopMenuPointer; + menuBtn.onpointerup=stopMenuPointer; menuBtn.onclick=(e)=>{ e.stopPropagation(); e.preventDefault(); @@ -3637,6 +3640,7 @@ function renderSessionListFromCache(){ const _makeSessionSwipeAffordance=(side,icon,label)=>{ const affordance=document.createElement('div'); affordance.className='session-swipe-affordance session-swipe-affordance-'+side; + affordance.setAttribute('aria-hidden','true'); const badge=document.createElement('span'); badge.className='session-swipe-badge'; badge.innerHTML=li(icon,18); @@ -3653,10 +3657,10 @@ function renderSessionListFromCache(){ ); } - // Use pointerup + manual double-tap detection instead of onclick/ondblclick. + // Use release events + manual double-tap detection instead of onclick/ondblclick. // onclick/ondblclick are unreliable on touch devices (iPad Safari especially): // hover-triggered layout shifts, ghost clicks, and 300ms delay all break - // single-tap navigation. pointerup fires immediately on both mouse & touch. + // single-tap navigation. // Mouse clicks are instant; touch presses need a 300ms delay to distinguish // a tap from a scroll-drag gesture on mobile. // Movement promotes pressing into dragging; drag release cancels a pending tap. @@ -3673,15 +3677,16 @@ function renderSessionListFromCache(){ let _pointerY=0; let _gesturePointerType=''; const _longPressDelay=400; - const _swipeActionThreshold=144; + const _archiveSwipeActionThreshold=128; + const _deleteSwipeActionThreshold=128; const _swipeCancelRatio=0.75; const _committedSwipeDuration=_sessionPrefersReducedMotion()?0:420; const _clearLongPressTimer=()=>{ if(_longPressTimer){clearTimeout(_longPressTimer);_longPressTimer=null;} if(!_longPressMenuOpened) el.classList.remove('long-pressing'); }; - const _beginSessionGesture=(clientX,clientY)=>{ - _gesturePointerType=''; + const _beginSessionGesture=(clientX,clientY,pointerType='')=>{ + _gesturePointerType=pointerType; _pointerDownX=clientX; _pointerDownY=clientY; _pointerX=clientX; @@ -3690,7 +3695,9 @@ function renderSessionListFromCache(){ _swipeTracking=false; _longPressMenuOpened=false; if(_clearDragTimer){clearTimeout(_clearDragTimer);_clearDragTimer=null;} - el.classList.remove('dragging','swipe-committed'); + el.classList.remove('dragging','swipe-committed','swipe-removing'); + el.style.removeProperty('height'); + el.style.removeProperty('min-height'); }; const _scheduleSessionLongPressMenu=()=>{ _clearLongPressTimer(); @@ -3707,8 +3714,11 @@ function renderSessionListFromCache(){ const _isSessionSwipeTarget=()=>{ return _gesturePointerType!=='mouse'&&!readOnly&&!_renamingSid&&!_sessionSelectMode; }; + const _isSessionActionTarget=(target)=>{ + return !!(actions&&target&&actions.contains(target)); + }; const _trackHorizontalSwipe=(dx,dy)=>{ - if(dx>16&&dx>dy*1.2) _swipeTracking=true; + if(dx>8&&dx>dy*1.1) _swipeTracking=true; }; const _promoteSessionDrag=(dx,dy)=>{ if(_gestureState!=='pressing'||(dx<=5&&dy<=5)) return; @@ -3717,6 +3727,19 @@ function renderSessionListFromCache(){ el.classList.add('dragging'); if(_clearDragTimer){clearTimeout(_clearDragTimer);_clearDragTimer=null;} }; + const _updateSessionGesture=(clientX,clientY)=>{ + if(_gestureState==='idle') return false; + _pointerX=clientX; + _pointerY=clientY; + const signedDx=clientX-_pointerDownX; + const signedDy=clientY-_pointerDownY; + const dx=Math.abs(signedDx); + const dy=Math.abs(signedDy); + _promoteSessionDrag(dx,dy); + _trackHorizontalSwipe(dx,dy); + if(_isSessionSwipeTarget()&&(_swipeTracking||dx>dy)) _paintSessionSwipe(signedDx); + return _swipeTracking; + }; const _canSwipeDeleteSession=()=>{ return _isSessionSwipeTarget()&&!_isMessagingSession(s)&&!_isCliSession(s); }; @@ -3726,15 +3749,23 @@ function renderSessionListFromCache(){ const overshoot=Math.max(0,Math.abs(rawOffset)-72); const offset=Math.sign(rawOffset)*(Math.abs(revealedOffset)+Math.sqrt(overshoot)*5); const progress=Math.min(1,Math.abs(revealedOffset)/72); + const reveal=Math.min(132,Math.max(36,Math.abs(rawOffset)+24)); + const iconScale=1+Math.min(.45,Math.max(0,Math.abs(rawOffset)-52)/130); el.style.setProperty('--session-swipe-offset',offset+'px'); + el.style.setProperty('--session-swipe-reveal',reveal+'px'); + el.style.setProperty('--session-swipe-icon-scale',iconScale); el.style.setProperty('--session-swipe-progress',Math.pow(progress,1.5)); el.classList.toggle('swiping-right',offset>0); el.classList.toggle('swiping-left',offset<0); }; const _clearSessionSwipePaint=()=>{ el.style.removeProperty('--session-swipe-offset'); + el.style.removeProperty('--session-swipe-reveal'); + el.style.removeProperty('--session-swipe-icon-scale'); el.style.removeProperty('--session-swipe-progress'); - el.classList.remove('swiping-right','swiping-left','swipe-committed'); + el.style.removeProperty('height'); + el.style.removeProperty('min-height'); + el.classList.remove('swiping-right','swiping-left','swipe-committed','swipe-removing'); }; const _settleSessionSwipePaint=()=>{ el.classList.remove('dragging'); @@ -3752,7 +3783,8 @@ function renderSessionListFromCache(){ }; const _handleSessionSwipe=(signedDx,signedDy)=>{ if(_gestureState==='committed'||!_isSessionSwipeTarget()) return false; - if(Math.abs(signedDx)<_swipeActionThreshold) return false; + const actionThreshold=signedDx>0?_archiveSwipeActionThreshold:_deleteSwipeActionThreshold; + if(Math.abs(signedDx)Math.abs(signedDx)*_swipeCancelRatio) return false; _gestureState='committed'; _clearLongPressTimer(); @@ -3766,10 +3798,11 @@ function renderSessionListFromCache(){ if(!archived) _settleSessionSwipePaint(); },_committedSwipeDuration); }else if(_canSwipeDeleteSession()){ - el.classList.remove('dragging'); + _completeSessionSwipePaint(signedDx); + const completedAt=Date.now(); deleteSession(s.session_id,async()=>{ - _completeSessionSwipePaint(signedDx); - await new Promise(resolve=>setTimeout(resolve,_committedSwipeDuration)); + const remaining=_committedSwipeDuration-(Date.now()-completedAt); + if(remaining>0) await new Promise(resolve=>setTimeout(resolve,remaining)); }).then((deleted)=>{ if(!deleted) _settleSessionSwipePaint(); }); @@ -3784,7 +3817,11 @@ function renderSessionListFromCache(){ return _handleSessionSwipe(_pointerX-_pointerDownX,_pointerY-_pointerDownY); }; const _clearPointerDragState=()=>{ - const wasDragging=_gestureState==='dragging'; + if(_gestureState==='committed'){ + _clearLongPressTimer(); + return; + } + const wasDragging=_gestureState==='dragging'||_swipeTracking; _gestureState='idle'; _clearLongPressTimer(); if(wasDragging){ @@ -3792,75 +3829,42 @@ function renderSessionListFromCache(){ _clearDragTimer=setTimeout(()=>{_settleSessionSwipePaint();_clearDragTimer=null;},50); } }; - el.onpointerdown=(e)=>{ - if(e.pointerType==='mouse' && e.button!==0) return; - _beginSessionGesture(e.clientX,e.clientY); - _gesturePointerType=e.pointerType||''; - if(e.pointerType==='touch'||e.pointerType==='pen'){ - _scheduleSessionLongPressMenu(); - } - }; - el.onpointermove=(e)=>{ - // Plain hover also dispatches pointermove. Only mark a row as dragging - // after an actual press starts on this row; otherwise hovered rows stay - // faded until the next sidebar rerender clears their DOM nodes. - if(_gestureState==='idle') return; - _pointerX=e.clientX; - _pointerY=e.clientY; - const dx=Math.abs(e.clientX-_pointerDownX); - const dy=Math.abs(e.clientY-_pointerDownY); - _promoteSessionDrag(dx,dy); - const signedDx=e.clientX-_pointerDownX; - const signedDy=e.clientY-_pointerDownY; - _trackHorizontalSwipe(Math.abs(signedDx),Math.abs(signedDy)); - if(_isSessionSwipeTarget()&&(_swipeTracking||Math.abs(signedDx)>Math.abs(signedDy))) _paintSessionSwipe(signedDx); - }; - el.onpointercancel=_clearPointerDragState; - el.onpointerleave=()=>{ - if(_gesturePointerType==='mouse'&&_gestureState!=='idle') _clearPointerDragState(); - }; - el.onpointerup=(e)=>{ - if(e.pointerType==='mouse' && e.button!==0) return; // ignore right/middle click - const wasDragging=_gestureState==='dragging'; + const _finishSessionGesture=(clientX,clientY,target,pointerType)=>{ + const wasDragging=_gestureState==='dragging'||_swipeTracking; _clearLongPressTimer(); - if(_renamingSid) return; - if(actions&&actions.contains(e.target)) return; - _pointerX=e.clientX; - _pointerY=e.clientY; + if(_renamingSid){_gestureState='idle';return false;} + if(_isSessionActionTarget(target)){_gestureState='idle';return false;} + _pointerX=clientX; + _pointerY=clientY; _commitSessionSwipe(); - if(_longPressMenuOpened||_gestureState==='committed'){e.stopPropagation();return;} - if(_sessionActionMenu&&!_sessionActionMenu.contains(e.target)){ + if(_longPressMenuOpened){_gestureState='idle';return true;} + if(_gestureState==='committed') return true; + if(_sessionActionMenu&&!_sessionActionMenu.contains(target)){ closeSessionActionMenu(); - e.stopPropagation(); - return; + return true; } - if(e.target&&e.target.closest&&e.target.closest('.session-child-count,.session-child-sessions,.session-child-session,.session-lineage-count,.session-lineage-segments,.session-lineage-segment')) return; - if(_sessionSelectMode){e.stopPropagation();if(!readOnly)toggleSessionSelect(s.session_id);return;} - // If the pointer moved enough to be a drag, cancel any pending tap + if(target&&target.closest&&target.closest('.session-child-count,.session-child-sessions,.session-child-session,.session-lineage-count,.session-lineage-segments,.session-lineage-segment')) return false; + if(_sessionSelectMode){if(!readOnly)toggleSessionSelect(s.session_id);return true;} if(wasDragging){ clearTimeout(_tapTimer);_tapTimer=null;_lastTapTime=0; _gestureState='idle'; _clearDragTimer=setTimeout(()=>{_settleSessionSwipePaint();_clearDragTimer=null;},50); - return; + return false; } _gestureState='idle'; const now=Date.now(); if(now-_lastTapTime<350){ - // Double-tap: rename clearTimeout(_tapTimer); _tapTimer=null; _lastTapTime=0; el.classList.remove('loading'); startRename(); - return; + return false; } _lastTapTime=now; - // Single tap: wait to ensure it's not the first of a double-tap, - // then navigate. Mouse is instant; touch needs delay to suppress - // accidental navigation during scroll-drag lifts. clearTimeout(_tapTimer); - const delay=e.pointerType==='mouse'?0:300; - if(e.pointerType!=='mouse') el.classList.add('loading'); + const delay=pointerType==='mouse'?0:300; + if(pointerType!=='mouse') el.classList.add('loading'); _tapTimer=setTimeout(async()=>{ _tapTimer=null; _lastTapTime=0; @@ -3878,6 +3882,32 @@ function renderSessionListFromCache(){ el.classList.remove('loading'); } }, delay); + return false; + }; + el.onpointerdown=(e)=>{ + if(e.pointerType==='touch') return; + if(e.pointerType==='mouse' && e.button!==0) return; + if(_isSessionActionTarget(e.target)) return; + _beginSessionGesture(e.clientX,e.clientY,e.pointerType||''); + if(e.pointerType==='pen'){ + _scheduleSessionLongPressMenu(); + } + }; + el.onpointermove=(e)=>{ + if(e.pointerType==='touch') return; + // Plain hover also dispatches pointermove. Only mark a row as dragging + // after an actual press starts on this row; otherwise hovered rows stay + // faded until the next sidebar rerender clears their DOM nodes. + _updateSessionGesture(e.clientX,e.clientY); + }; + el.onpointercancel=_clearPointerDragState; + el.onpointerleave=()=>{ + if(_gestureState!=='idle') _clearPointerDragState(); + }; + el.onpointerup=(e)=>{ + if(e.pointerType==='touch') return; + if(e.pointerType==='mouse' && e.button!==0) return; // ignore right/middle click + if(_finishSessionGesture(e.clientX,e.clientY,e.target,e.pointerType)) e.stopPropagation(); }; // Add ondblclick for more reliable double-click detection el.ondblclick=(e)=>{ @@ -3895,40 +3925,22 @@ function renderSessionListFromCache(){ } }; el.addEventListener('touchstart',(e)=>{ + if(_isSessionActionTarget(e.target)) return; const touch=e.changedTouches&&e.changedTouches[0]; if(!touch) return; - _beginSessionGesture(touch.clientX,touch.clientY); - _gesturePointerType='touch'; + _beginSessionGesture(touch.clientX,touch.clientY,'touch'); _scheduleSessionLongPressMenu(); },{passive:true}); el.addEventListener('touchmove',(e)=>{ - if(_gestureState==='idle') return; const touch=e.changedTouches&&e.changedTouches[0]; if(!touch) return; - _pointerX=touch.clientX; - _pointerY=touch.clientY; - const signedDx=touch.clientX-_pointerDownX; - const signedDy=touch.clientY-_pointerDownY; - const dx=Math.abs(signedDx); - const dy=Math.abs(signedDy); - _promoteSessionDrag(dx,dy); - _trackHorizontalSwipe(dx,dy); - if(_isSessionSwipeTarget()&&(_swipeTracking||dx>dy)) _paintSessionSwipe(signedDx); - if(_swipeTracking) e.preventDefault(); + if(_updateSessionGesture(touch.clientX,touch.clientY)) e.preventDefault(); },{passive:false}); + el.addEventListener('touchcancel',_clearPointerDragState,{passive:true}); el.addEventListener('touchend',(e)=>{ - const wasDragging=_gestureState==='dragging'; - _clearLongPressTimer(); const touch=e.changedTouches&&e.changedTouches[0]; - if(touch){ - _pointerX=touch.clientX; - _pointerY=touch.clientY; - } - _commitSessionSwipe(); - if(wasDragging){ - if(_gestureState!=='committed') _clearDragTimer=setTimeout(()=>{_settleSessionSwipePaint();_clearDragTimer=null;},50); - } - if(_gestureState!=='committed') _gestureState='idle'; + if(!touch) return; + if(_finishSessionGesture(touch.clientX,touch.clientY,e.target,'touch')) e.stopPropagation(); },{passive:true}); return el; } diff --git a/static/style.css b/static/style.css index daf86032b3..8bbd8b6d48 100644 --- a/static/style.css +++ b/static/style.css @@ -664,8 +664,8 @@ box-shadow:0 0 0 1px color-mix(in srgb,var(--accent) 38%,transparent); animation:session-long-press .4s cubic-bezier(.2,.8,.2,1) both; } - .session-item.swiping-right{background:color-mix(in srgb,var(--warning) 18%,var(--surface));box-shadow:0 0 0 1px color-mix(in srgb,var(--warning) 60%,transparent);} - .session-item.swiping-left{background:color-mix(in srgb,var(--error) 16%,var(--surface));box-shadow:0 0 0 1px color-mix(in srgb,var(--error) 60%,transparent);} + .session-item.swiping-right{background:color-mix(in srgb,var(--warning) 16%,var(--surface));box-shadow:0 0 0 1px color-mix(in srgb,var(--warning) 48%,transparent);} + .session-item.swiping-left{background:color-mix(in srgb,var(--error) 14%,var(--surface));box-shadow:0 0 0 1px color-mix(in srgb,var(--error) 48%,transparent);} .session-swipe-affordance{ position:absolute; top:0; @@ -675,37 +675,47 @@ align-items:center; justify-content:center; gap:3px; - width:72px; - padding:0 10px; + width:var(--session-swipe-reveal,0px); + min-width:36px; + padding:0 8px; box-sizing:border-box; opacity:0; + overflow:hidden; transform:translateX(calc(-1 * var(--session-swipe-offset,0px))) scale(calc(.82 + var(--session-swipe-progress,0) * .18)); - transform-origin:center; pointer-events:none; + z-index:0; } .session-swipe-affordance-right{ left:0; - color:var(--warning); + color:#fff; + background:var(--warning); + border-radius:8px 6px 6px 8px; + transform-origin:left center; } .session-swipe-affordance-left{ right:0; - color:var(--error); + color:#fff; + background:var(--error); + border-radius:6px 8px 8px 6px; + transform-origin:right center; } .session-item.swiping-right .session-swipe-affordance-right, .session-item.swiping-left .session-swipe-affordance-left{ opacity:var(--session-swipe-progress,0); } + .session-text,.session-state-indicator,.session-actions{z-index:1;} .session-swipe-badge{ - width:30px; - height:30px; - border-radius:999px; + width:28px; + height:28px; + border-radius:0; display:flex; align-items:center; justify-content:center; color:#fff; + transform:scaleX(var(--session-swipe-icon-scale,1)); + transform-origin:center; } - .session-swipe-affordance-right .session-swipe-badge{background:var(--warning);} - .session-swipe-affordance-left .session-swipe-badge{background:var(--error);} + .session-swipe-badge svg{display:block;stroke-width:2.2;} .session-swipe-label{ max-width:58px; overflow:hidden; @@ -730,16 +740,16 @@ .session-item.swipe-committed .session-swipe-affordance{transition:opacity .18s ease,transform .18s ease;} /* Suppress hover highlight during drag to avoid visual noise mid-scroll */ .session-item.dragging:hover{background:transparent;color:var(--muted);} - .session-item.dragging.swiping-right{background:color-mix(in srgb,var(--warning) 18%,var(--surface));} - .session-item.dragging.swiping-left{background:color-mix(in srgb,var(--error) 16%,var(--surface));} + .session-item.dragging.swiping-right{background:color-mix(in srgb,var(--warning) 16%,var(--surface));} + .session-item.dragging.swiping-left{background:color-mix(in srgb,var(--error) 14%,var(--surface));} /* Restore hover padding-right only for mouse (hover:hover) devices. Touch/iPad (hover:none) must NOT expand padding-right on :hover — the expansion causes a layout-reflow mid-tap that moves session-actions under the finger, triggering stopPropagation and swallowing navigation. */ @media (hover:hover){:root:not(.dark) .session-item:hover{background:var(--hover-bg);color:var(--text);}.session-item:hover{padding-right:40px;}} .session-item.active{background:var(--accent-bg);color:var(--accent);} - .session-item.active.swiping-right{background:color-mix(in srgb,var(--warning) 22%,var(--accent-bg));} - .session-item.active.swiping-left{background:color-mix(in srgb,var(--error) 20%,var(--accent-bg));} + .session-item.active.swiping-right{background:color-mix(in srgb,var(--warning) 20%,var(--accent-bg));} + .session-item.active.swiping-left{background:color-mix(in srgb,var(--error) 18%,var(--accent-bg));} .session-item.streaming .session-title{color:var(--accent);} .session-item.streaming .session-title-row{color:var(--text);} .session-text{flex:1;min-width:0;display:flex;flex-direction:column;gap:2px;overflow:hidden;} diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py index 8e373fd515..72cbd48481 100644 --- a/tests/test_session_touch_actions.py +++ b/tests/test_session_touch_actions.py @@ -37,7 +37,7 @@ def test_mobile_session_menu_opens_from_long_press_and_hides_dots(): assert "_openSessionActionMenu(s, el)" in SESSIONS_JS assert "@media (hover:none) and (pointer:coarse)" in STYLE_CSS assert ".session-actions{display:none;}" in STYLE_CSS - assert "const _beginSessionGesture=(clientX,clientY)=>{" in SESSIONS_JS + assert "const _beginSessionGesture=(clientX,clientY,pointerType='')=>{" in SESSIONS_JS assert "const _scheduleSessionLongPressMenu=()=>{" in SESSIONS_JS mobile_touch = STYLE_CSS[STYLE_CSS.find("@media (hover:none) and (pointer:coarse)"):STYLE_CSS.find("@media (max-width: 340px)")] assert ".session-item{padding-right:6px;}" in mobile_touch @@ -46,35 +46,59 @@ def test_mobile_session_menu_opens_from_long_press_and_hides_dots(): def test_open_session_menu_consumes_next_row_activation(): - assert "if(_sessionActionMenu&&!_sessionActionMenu.contains(e.target)){" in SESSIONS_JS + assert "if(_sessionActionMenu&&!_sessionActionMenu.contains(target)){" in SESSIONS_JS assert "closeSessionActionMenu();" in SESSIONS_JS assert "e.stopPropagation();" in SESSIONS_JS + assert "const stopMenuPointer=(e)=>e.stopPropagation();" in SESSIONS_JS + assert "menuBtn.onpointerdown=stopMenuPointer;" in SESSIONS_JS + assert "menuBtn.onpointerup=stopMenuPointer;" in SESSIONS_JS + menu_btn_idx = SESSIONS_JS.find("menuBtn.onpointerdown=stopMenuPointer;") + menu_click_idx = SESSIONS_JS.find("menuBtn.onclick=(e)=>{", menu_btn_idx) + assert menu_btn_idx > 0 and menu_click_idx > menu_btn_idx + assert "const _isSessionActionTarget=(target)=>{" in SESSIONS_JS + assert "return !!(actions&&target&&actions.contains(target));" in SESSIONS_JS + assert "if(_isSessionActionTarget(e.target)) return;" in SESSIONS_JS + assert "if(_isSessionActionTarget(target)){_gestureState='idle';return false;}" in SESSIONS_JS + assert "if(_longPressMenuOpened){_gestureState='idle';return true;}" in SESSIONS_JS + finish_idx = SESSIONS_JS.find("const _finishSessionGesture=(clientX,clientY,target,pointerType)=>{") + dismiss_idx = SESSIONS_JS.find("if(_sessionActionMenu&&!_sessionActionMenu.contains(target)){", finish_idx) + load_idx = SESSIONS_JS.find("await loadSession(s.session_id)", finish_idx) pointerup_idx = SESSIONS_JS.find("el.onpointerup=(e)=>{") - dismiss_idx = SESSIONS_JS.find("if(_sessionActionMenu&&!_sessionActionMenu.contains(e.target)){", pointerup_idx) - load_idx = SESSIONS_JS.find("await loadSession(s.session_id)", pointerup_idx) - assert pointerup_idx > 0 and load_idx > pointerup_idx - assert dismiss_idx > pointerup_idx and dismiss_idx < load_idx + assert finish_idx > 0 and load_idx > finish_idx + assert dismiss_idx > finish_idx and dismiss_idx < load_idx + assert "if(_finishSessionGesture(e.clientX,e.clientY,e.target,e.pointerType)) e.stopPropagation();" in SESSIONS_JS[pointerup_idx:] def test_session_swipes_archive_right_and_delete_left(): assert "_gesturePointerType!=='mouse'" in SESSIONS_JS assert "_swipeTracking=true" in SESSIONS_JS assert "const _trackHorizontalSwipe=(dx,dy)=>{" in SESSIONS_JS - assert "_swipeActionThreshold=144" in SESSIONS_JS + assert "_archiveSwipeActionThreshold=128" in SESSIONS_JS + assert "_deleteSwipeActionThreshold=128" in SESSIONS_JS assert "_committedSwipeDuration=_sessionPrefersReducedMotion()?0:420" in SESSIONS_JS assert "const _handleSessionSwipe=(signedDx,signedDy)=>{" in SESSIONS_JS - assert "if(_isSessionSwipeTarget()&&(_swipeTracking||Math.abs(signedDx)>Math.abs(signedDy))) _paintSessionSwipe(signedDx)" in SESSIONS_JS + assert "const actionThreshold=signedDx>0?_archiveSwipeActionThreshold:_deleteSwipeActionThreshold;" in SESSIONS_JS + assert "if(Math.abs(signedDx){" in SESSIONS_JS assert "if(_isSessionSwipeTarget()&&(_swipeTracking||dx>dy)) _paintSessionSwipe(signedDx)" in SESSIONS_JS + assert "_updateSessionGesture(e.clientX,e.clientY);" in SESSIONS_JS + assert "if(_updateSessionGesture(touch.clientX,touch.clientY)) e.preventDefault();" in SESSIONS_JS + assert "_beginSessionGesture(touch.clientX,touch.clientY,'touch');" in SESSIONS_JS assert "if(signedDx>0){" in SESSIONS_JS assert "_archiveSession(s,!s.archived)" in SESSIONS_JS + assert "const completedAt=Date.now();" in SESSIONS_JS + assert "const remaining=_committedSwipeDuration-(Date.now()-completedAt);" in SESSIONS_JS assert "deleteSession(s.session_id,async()=>{" in SESSIONS_JS assert "showToast('Imported sessions cannot be deleted here.',3000);" in SESSIONS_JS assert "let _gestureState='idle';" in SESSIONS_JS assert "_gestureState='dragging';" in SESSIONS_JS assert "const _promoteSessionDrag=(dx,dy)=>{" in SESSIONS_JS - assert "if(_gesturePointerType==='mouse'&&_gestureState!=='idle') _clearPointerDragState();" in SESSIONS_JS assert "const _commitSessionSwipe=()=>{" in SESSIONS_JS assert "_commitSessionSwipe();" in SESSIONS_JS + assert "const wasDragging=_gestureState==='dragging'||_swipeTracking;" in SESSIONS_JS + assert "if(_gestureState==='committed'){" in SESSIONS_JS + assert SESSIONS_JS.count("if(e.pointerType==='touch') return;") >= 3 + assert "el.onpointercancel=_clearPointerDragState;" in SESSIONS_JS def test_session_swipes_show_visual_feedback_and_touch_load_clears(): @@ -84,11 +108,21 @@ def test_session_swipes_show_visual_feedback_and_touch_load_clears(): assert "const overshoot=Math.max(0,Math.abs(rawOffset)-72)" in SESSIONS_JS assert "Math.sqrt(overshoot)*5" in SESSIONS_JS assert "el.style.setProperty('--session-swipe-offset',offset+'px')" in SESSIONS_JS + assert "const reveal=Math.min(132,Math.max(36,Math.abs(rawOffset)+24));" in SESSIONS_JS + assert "const iconScale=1+Math.min(.45,Math.max(0,Math.abs(rawOffset)-52)/130);" in SESSIONS_JS + assert "el.style.setProperty('--session-swipe-reveal',reveal+'px')" in SESSIONS_JS + assert "el.style.setProperty('--session-swipe-icon-scale',iconScale)" in SESSIONS_JS assert "const progress=Math.min(1,Math.abs(revealedOffset)/72)" in SESSIONS_JS assert "el.style.setProperty('--session-swipe-progress',Math.pow(progress,1.5))" in SESSIONS_JS assert "const _clearSessionSwipePaint=()=>{" in SESSIONS_JS + assert "el.style.removeProperty('--session-swipe-reveal');" in SESSIONS_JS + assert "el.style.removeProperty('--session-swipe-icon-scale');" in SESSIONS_JS + assert "el.style.removeProperty('height');" in SESSIONS_JS + assert "el.style.removeProperty('min-height');" in SESSIONS_JS + assert "el.classList.remove('swiping-right','swiping-left','swipe-committed','swipe-removing')" in SESSIONS_JS assert "const _settleSessionSwipePaint=()=>{" in SESSIONS_JS assert "const _completeSessionSwipePaint=(signedDx)=>{" in SESSIONS_JS + assert "el.classList.remove('dragging');" in SESSIONS_JS assert "el.classList.add('swipe-committed')" in SESSIONS_JS assert "el.style.height=rect.height+'px'" in SESSIONS_JS assert "requestAnimationFrame(()=>el.classList.add('swipe-removing'))" in SESSIONS_JS @@ -96,26 +130,32 @@ def test_session_swipes_show_visual_feedback_and_touch_load_clears(): assert "deleteSession(s.session_id,async()=>{" in SESSIONS_JS assert "const archived=await _archiveSession(s,!s.archived);" in SESSIONS_JS assert "if(!archived) _settleSessionSwipePaint();" in SESSIONS_JS - assert "await new Promise(resolve=>setTimeout(resolve,_committedSwipeDuration));" in SESSIONS_JS + assert "if(remaining>0) await new Promise(resolve=>setTimeout(resolve,remaining));" in SESSIONS_JS assert "async function deleteSession(sid, beforeDelete=null){" in SESSIONS_JS + assert "if(beforeDelete) await beforeDelete();" in SESSIONS_JS assert "requestAnimationFrame(()=>requestAnimationFrame(_clearSessionSwipePaint))" in SESSIONS_JS assert ".session-item.swiping-right" in STYLE_CSS assert ".session-item.swiping-left" in STYLE_CSS assert "const _makeSessionSwipeAffordance=(side,icon,label)=>{" in SESSIONS_JS + assert "affordance.setAttribute('aria-hidden','true');" in SESSIONS_JS assert "_makeSessionSwipeAffordance('right',s.archived?'undo':'archive'" in SESSIONS_JS assert "_makeSessionSwipeAffordance('left','trash-2'" in SESSIONS_JS assert ".session-swipe-affordance{" in STYLE_CSS assert "opacity:var(--session-swipe-progress,0)" in STYLE_CSS + assert "width:var(--session-swipe-reveal,0px)" in STYLE_CSS + assert ".session-item.swiping-right{background:color-mix(in srgb,var(--warning) 16%,var(--surface));box-shadow:0 0 0 1px color-mix(in srgb,var(--warning) 48%,transparent);}" in STYLE_CSS + assert ".session-item.swiping-left{background:color-mix(in srgb,var(--error) 14%,var(--surface));box-shadow:0 0 0 1px color-mix(in srgb,var(--error) 48%,transparent);}" in STYLE_CSS + assert "background:var(--warning)" in STYLE_CSS + assert "background:var(--error)" in STYLE_CSS assert ".session-item.swiping-right .session-swipe-affordance-right" in STYLE_CSS assert ".session-item.swiping-left .session-swipe-affordance-left" in STYLE_CSS assert "transform:translateX(calc(-1 * var(--session-swipe-offset,0px))) scale(calc(.82 + var(--session-swipe-progress,0) * .18))" in STYLE_CSS assert ".session-swipe-badge{" in STYLE_CSS + assert "transform:scaleX(var(--session-swipe-icon-scale,1))" in STYLE_CSS assert ".session-swipe-label{" in STYLE_CSS assert "transform .5s cubic-bezier(.2,.8,.2,1)" in STYLE_CSS assert ".session-item.dragging.swiping-right" in STYLE_CSS assert ".session-item.dragging.swiping-left" in STYLE_CSS - assert ".session-item.active.swiping-right" in STYLE_CSS - assert ".session-item.active.swiping-left" in STYLE_CSS assert ".session-item.dragging{transition:background .15s,color .15s,box-shadow .15s ease;}" in STYLE_CSS assert ".session-item.swipe-committed" in STYLE_CSS assert ".session-item.swipe-removing{" in STYLE_CSS @@ -139,7 +179,7 @@ def test_session_removal_reflows_surviving_rows_smoothly(): assert "row.style.setProperty('--session-reflow-offset',delta+'px')" in SESSIONS_JS assert "row.classList.add('session-reflowing')" in SESSIONS_JS assert "row.style.setProperty('--session-reflow-offset','0px')" in SESSIONS_JS - assert SESSIONS_JS.count("const reflowPositions=_captureSessionReflowPositions();") >= 2 + assert "const reflowPositions=_captureSessionReflowPositions();" in SESSIONS_JS assert SESSIONS_JS.count("_pendingSessionReflowPositions=reflowPositions;") >= 2 assert "_playQueuedSessionReflowAnimation();" in SESSIONS_JS assert ".session-item.session-reflowing{transition:background .15s,color .15s,transform .36s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;will-change:transform;}" in STYLE_CSS @@ -148,9 +188,14 @@ def test_session_removal_reflows_surviving_rows_smoothly(): def test_ios_touch_events_drive_session_swipes(): assert "el.addEventListener('touchstart'" in SESSIONS_JS assert "el.addEventListener('touchmove'" in SESSIONS_JS + assert "el.addEventListener('touchcancel',_clearPointerDragState" in SESSIONS_JS assert "el.addEventListener('touchend'" in SESSIONS_JS + assert "const _finishSessionGesture=(clientX,clientY,target,pointerType)=>{" in SESSIONS_JS assert "{passive:false}" in SESSIONS_JS - assert "e.preventDefault()" in SESSIONS_JS + assert "if(_updateSessionGesture(touch.clientX,touch.clientY)) e.preventDefault();" in SESSIONS_JS + assert SESSIONS_JS.count("if(e.pointerType==='touch') return;") >= 3 + assert "if(_finishSessionGesture(touch.clientX,touch.clientY,e.target,'touch')) e.stopPropagation();" in SESSIONS_JS + assert "window.PointerEvent" not in SESSIONS_JS def test_touch_session_rows_preserve_vertical_scroll(): From 6c964232311318517228ba947d3a762465bac60d Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Thu, 21 May 2026 06:35:07 -0600 Subject: [PATCH 013/349] v4 effects save --- static/sessions.js | 2 +- static/style.css | 4 ++++ tests/test_session_touch_actions.py | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/static/sessions.js b/static/sessions.js index 836f2c8c96..f1124c7026 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -3652,7 +3652,7 @@ function renderSessionListFromCache(){ }; if(!readOnly){ el.append( - _makeSessionSwipeAffordance('right',s.archived?'undo':'archive',s.archived?t('session_restore'):t('session_batch_archive')), + _makeSessionSwipeAffordance('right',s.archived?'undo':'archive',s.archived?'Restore':t('session_batch_archive')), _makeSessionSwipeAffordance('left','trash-2',t('session_batch_delete')), ); } diff --git a/static/style.css b/static/style.css index 8bbd8b6d48..f92dda1664 100644 --- a/static/style.css +++ b/static/style.css @@ -750,6 +750,10 @@ .session-item.active{background:var(--accent-bg);color:var(--accent);} .session-item.active.swiping-right{background:color-mix(in srgb,var(--warning) 20%,var(--accent-bg));} .session-item.active.swiping-left{background:color-mix(in srgb,var(--error) 18%,var(--accent-bg));} + .session-item.archived .session-swipe-affordance-right{background:var(--success);} + .session-item.archived.swiping-right, + .session-item.archived.dragging.swiping-right{background:color-mix(in srgb,var(--success) 16%,var(--surface));box-shadow:0 0 0 1px color-mix(in srgb,var(--success) 48%,transparent);} + .session-item.active.archived.swiping-right{background:color-mix(in srgb,var(--success) 20%,var(--accent-bg));} .session-item.streaming .session-title{color:var(--accent);} .session-item.streaming .session-title-row{color:var(--text);} .session-text{flex:1;min-width:0;display:flex;flex-direction:column;gap:2px;overflow:hidden;} diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py index 72cbd48481..6add3283d5 100644 --- a/tests/test_session_touch_actions.py +++ b/tests/test_session_touch_actions.py @@ -138,7 +138,7 @@ def test_session_swipes_show_visual_feedback_and_touch_load_clears(): assert ".session-item.swiping-left" in STYLE_CSS assert "const _makeSessionSwipeAffordance=(side,icon,label)=>{" in SESSIONS_JS assert "affordance.setAttribute('aria-hidden','true');" in SESSIONS_JS - assert "_makeSessionSwipeAffordance('right',s.archived?'undo':'archive'" in SESSIONS_JS + assert "_makeSessionSwipeAffordance('right',s.archived?'undo':'archive',s.archived?'Restore':t('session_batch_archive'))" in SESSIONS_JS assert "_makeSessionSwipeAffordance('left','trash-2'" in SESSIONS_JS assert ".session-swipe-affordance{" in STYLE_CSS assert "opacity:var(--session-swipe-progress,0)" in STYLE_CSS @@ -146,6 +146,9 @@ def test_session_swipes_show_visual_feedback_and_touch_load_clears(): assert ".session-item.swiping-right{background:color-mix(in srgb,var(--warning) 16%,var(--surface));box-shadow:0 0 0 1px color-mix(in srgb,var(--warning) 48%,transparent);}" in STYLE_CSS assert ".session-item.swiping-left{background:color-mix(in srgb,var(--error) 14%,var(--surface));box-shadow:0 0 0 1px color-mix(in srgb,var(--error) 48%,transparent);}" in STYLE_CSS assert "background:var(--warning)" in STYLE_CSS + assert ".session-item.archived .session-swipe-affordance-right{background:var(--success);}" in STYLE_CSS + assert ".session-item.archived.dragging.swiping-right" in STYLE_CSS + assert ".session-item.active.archived.swiping-right{background:color-mix(in srgb,var(--success) 20%,var(--accent-bg));}" in STYLE_CSS assert "background:var(--error)" in STYLE_CSS assert ".session-item.swiping-right .session-swipe-affordance-right" in STYLE_CSS assert ".session-item.swiping-left .session-swipe-affordance-left" in STYLE_CSS From 03266c2644e3ec83d0497ad843c8da1e400385fb Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Thu, 21 May 2026 06:52:33 -0600 Subject: [PATCH 014/349] fix: preserve touch swipe exit animations --- static/sessions.js | 14 ++++++++------ tests/test_session_touch_actions.py | 16 ++++++++++++---- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/static/sessions.js b/static/sessions.js index f1124c7026..eb59da728f 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -3798,11 +3798,10 @@ function renderSessionListFromCache(){ if(!archived) _settleSessionSwipePaint(); },_committedSwipeDuration); }else if(_canSwipeDeleteSession()){ - _completeSessionSwipePaint(signedDx); - const completedAt=Date.now(); + el.classList.remove('dragging'); deleteSession(s.session_id,async()=>{ - const remaining=_committedSwipeDuration-(Date.now()-completedAt); - if(remaining>0) await new Promise(resolve=>setTimeout(resolve,remaining)); + _completeSessionSwipePaint(signedDx); + await new Promise(resolve=>setTimeout(resolve,_committedSwipeDuration)); }).then((deleted)=>{ if(!deleted) _settleSessionSwipePaint(); }); @@ -3900,9 +3899,12 @@ function renderSessionListFromCache(){ // faded until the next sidebar rerender clears their DOM nodes. _updateSessionGesture(e.clientX,e.clientY); }; - el.onpointercancel=_clearPointerDragState; + el.onpointercancel=(e)=>{ + if(e.pointerType==='touch') return; + _clearPointerDragState(); + }; el.onpointerleave=()=>{ - if(_gestureState!=='idle') _clearPointerDragState(); + if(_gesturePointerType==='mouse'&&_gestureState!=='idle') _clearPointerDragState(); }; el.onpointerup=(e)=>{ if(e.pointerType==='touch') return; diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py index 6add3283d5..81e929b079 100644 --- a/tests/test_session_touch_actions.py +++ b/tests/test_session_touch_actions.py @@ -86,9 +86,15 @@ def test_session_swipes_archive_right_and_delete_left(): assert "_beginSessionGesture(touch.clientX,touch.clientY,'touch');" in SESSIONS_JS assert "if(signedDx>0){" in SESSIONS_JS assert "_archiveSession(s,!s.archived)" in SESSIONS_JS - assert "const completedAt=Date.now();" in SESSIONS_JS - assert "const remaining=_committedSwipeDuration-(Date.now()-completedAt);" in SESSIONS_JS assert "deleteSession(s.session_id,async()=>{" in SESSIONS_JS + delete_branch_start = SESSIONS_JS.find("}else if(_canSwipeDeleteSession()){") + delete_branch_end = SESSIONS_JS.find("}else if(typeof showToast", delete_branch_start) + assert delete_branch_start >= 0 and delete_branch_end > delete_branch_start + delete_branch = SESSIONS_JS[delete_branch_start:delete_branch_end] + delete_call_idx = delete_branch.find("deleteSession(s.session_id,async()=>{") + delete_complete_idx = delete_branch.find("_completeSessionSwipePaint(signedDx);") + assert delete_call_idx > 0 and delete_complete_idx > delete_call_idx + assert "const completedAt=Date.now();" not in delete_branch assert "showToast('Imported sessions cannot be deleted here.',3000);" in SESSIONS_JS assert "let _gestureState='idle';" in SESSIONS_JS assert "_gestureState='dragging';" in SESSIONS_JS @@ -98,7 +104,9 @@ def test_session_swipes_archive_right_and_delete_left(): assert "const wasDragging=_gestureState==='dragging'||_swipeTracking;" in SESSIONS_JS assert "if(_gestureState==='committed'){" in SESSIONS_JS assert SESSIONS_JS.count("if(e.pointerType==='touch') return;") >= 3 - assert "el.onpointercancel=_clearPointerDragState;" in SESSIONS_JS + assert "el.onpointercancel=(e)=>{" in SESSIONS_JS + assert "if(e.pointerType==='touch') return;" in SESSIONS_JS + assert "if(_gesturePointerType==='mouse'&&_gestureState!=='idle') _clearPointerDragState();" in SESSIONS_JS def test_session_swipes_show_visual_feedback_and_touch_load_clears(): @@ -130,7 +138,7 @@ def test_session_swipes_show_visual_feedback_and_touch_load_clears(): assert "deleteSession(s.session_id,async()=>{" in SESSIONS_JS assert "const archived=await _archiveSession(s,!s.archived);" in SESSIONS_JS assert "if(!archived) _settleSessionSwipePaint();" in SESSIONS_JS - assert "if(remaining>0) await new Promise(resolve=>setTimeout(resolve,remaining));" in SESSIONS_JS + assert "await new Promise(resolve=>setTimeout(resolve,_committedSwipeDuration));" in SESSIONS_JS assert "async function deleteSession(sid, beforeDelete=null){" in SESSIONS_JS assert "if(beforeDelete) await beforeDelete();" in SESSIONS_JS assert "requestAnimationFrame(()=>requestAnimationFrame(_clearSessionSwipePaint))" in SESSIONS_JS From 1d8d0bfeb734bd6e1eca29a0f27b08066b95e914 Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Thu, 21 May 2026 07:30:41 -0600 Subject: [PATCH 015/349] optimize performance --- static/sessions.js | 149 +++++++++++++---------- static/style.css | 9 +- tests/test_profile_switch_ux.py | 25 ++-- tests/test_session_touch_actions.py | 178 +++++++++++++--------------- 4 files changed, 178 insertions(+), 183 deletions(-) diff --git a/static/sessions.js b/static/sessions.js index eb59da728f..e7a2479acf 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -107,6 +107,10 @@ let _sessionListLastScrollAt = 0; let _pendingSessionListPayload = null; let _pendingSessionListApplyTimer = 0; const SESSION_LIST_INTERACTION_IDLE_MS = 700; +const SESSION_SWIPE_DURATION_MS = 420; +const SESSION_SWIPE_REFLOW_LEAD_MS = 180; +const SESSION_REFLOW_TIMEOUT_MS = 420; +const SESSION_LIST_FLIP_TIMEOUT_MS = 460; function _formatSessionModelWithGateway(s){ if(!s||!s.model)return''; @@ -1454,6 +1458,7 @@ const _lineageReportInflight = new Map(); let _lineageReportCacheGeneration = 0; let _sessionVisibleSidebarIds = []; let _pendingSessionReflowPositions = null; +const _optimisticallyRemovedSessionIds = new Set(); function _captureSessionReflowPositions(){ const list=$('sessionList'); @@ -1465,23 +1470,31 @@ function _captureSessionReflowPositions(){ return positions; } -function _playQueuedSessionReflowAnimation(){ - const before=_pendingSessionReflowPositions; - _pendingSessionReflowPositions=null; +function _waitForSessionMotion(ms){ + return new Promise(resolve=>setTimeout(resolve,ms)); +} + +function _playSessionRowsReflowFromPositions(before, timeoutMs, prefersReducedMotion){ if(!before||!before.size) return; - const reduce=_sessionPrefersReducedMotion(); - if(reduce) return; + if(prefersReducedMotion&&prefersReducedMotion()) return; const list=$('sessionList'); if(!list) return; + const movingRows=[]; list.querySelectorAll('.session-item[data-sid]').forEach(row=>{ const oldTop=before.get(row.dataset.sid); if(oldTop===undefined) return; const delta=oldTop-row.getBoundingClientRect().top; if(Math.abs(delta)<1) return; + movingRows.push({row,delta}); + }); + if(!movingRows.length) return; + movingRows.forEach(({row,delta})=>{ + row.style.transition='none'; row.style.setProperty('--session-reflow-offset',delta+'px'); row.classList.add('session-reflowing'); - row.getBoundingClientRect(); - row.style.setProperty('--session-reflow-offset','0px'); + }); + list.getBoundingClientRect(); + movingRows.forEach(({row})=>{ let reflowCleared=false; const clearReflow=()=>{ if(reflowCleared) return; @@ -1494,10 +1507,20 @@ function _playQueuedSessionReflowAnimation(){ if(event.propertyName==='transform') clearReflow(); }; row.addEventListener('transitionend',onReflowEnd); - setTimeout(clearReflow,420); + row.style.removeProperty('transition'); + requestAnimationFrame(()=>requestAnimationFrame(()=>{ + if(!reflowCleared) row.style.setProperty('--session-reflow-offset','0px'); + })); + setTimeout(clearReflow,timeoutMs); }); } +function _playQueuedSessionReflowAnimation(){ + const before=_pendingSessionReflowPositions; + _pendingSessionReflowPositions=null; + _playSessionRowsReflowFromPositions(before,SESSION_REFLOW_TIMEOUT_MS,_sessionPrefersReducedMotion); +} + function _discardQueuedSessionReflowAnimation(){ _pendingSessionReflowPositions=null; } @@ -1812,18 +1835,20 @@ function _playSessionActionMenuEntrance(menu){ menu.classList.add('open-animated'); } -async function _archiveSession(session, archived=true){ +async function _archiveSession(session, archived=true, beforeListRender=null){ if(_isReadOnlySession(session)){ if(typeof showToast==='function') showToast('Read-only imported sessions cannot be modified.',3000); return false; } const reflowPositions=_captureSessionReflowPositions(); + const renderHold=beforeListRender?Promise.resolve().then(beforeListRender):null; try{ const response=await api('/api/session/archive',{method:'POST',body:JSON.stringify({session_id:session.session_id,archived})}); session.archived=archived; if(S.session&&S.session.session_id===session.session_id) S.session.archived=archived; + if(renderHold) await renderHold; _pendingSessionReflowPositions=reflowPositions; await renderSessionList(); showToast(session.archived?_sessionArchiveToast(response,session):t('session_restored')); return true; - }catch(err){_pendingSessionReflowPositions=null;showToast(t('session_archive_failed')+err.message);return false;} + }catch(err){if(renderHold) await renderHold.catch(()=>{});_pendingSessionReflowPositions=null;showToast(t('session_archive_failed')+err.message);return false;} } function _openSessionActionMenu(session, anchorEl){ @@ -2003,46 +2028,13 @@ function animateNextSessionListRefresh(options={}){ if(options&&options.enterAll) _sessionListEnterAllAnimationPending = true; } -function _captureSessionListFlipPositions(){ - const list=$('sessionList'); - if(!list) return null; - const positions=new Map(); - list.querySelectorAll('.session-item[data-sid]').forEach(row=>{ - positions.set(row.dataset.sid,row.getBoundingClientRect().top); - }); - return positions; -} - function _sessionListPrefersReducedMotion(){ try{return window.matchMedia&&window.matchMedia('(prefers-reduced-motion: reduce)').matches;} catch(_){return false;} } function _playSessionListFlipAnimation(before){ - if(!before||!before.size||_sessionListPrefersReducedMotion()) return; - const list=$('sessionList'); - if(!list) return; - list.querySelectorAll('.session-item[data-sid]').forEach(row=>{ - const oldTop=before.get(row.dataset.sid); - if(oldTop===undefined) return; - const delta=oldTop-row.getBoundingClientRect().top; - if(Math.abs(delta)<1) return; - row.style.setProperty('--session-reflow-offset',delta+'px'); - row.classList.add('session-reflowing'); - row.getBoundingClientRect(); - row.style.setProperty('--session-reflow-offset','0px'); - let cleared=false; - const clear=()=>{ - if(cleared) return; - cleared=true; - row.classList.remove('session-reflowing'); - row.style.removeProperty('--session-reflow-offset'); - row.removeEventListener('transitionend',onEnd); - }; - const onEnd=(event)=>{ if(event.propertyName==='transform') clear(); }; - row.addEventListener('transitionend',onEnd); - setTimeout(clear,460); - }); + _playSessionRowsReflowFromPositions(before,SESSION_LIST_FLIP_TIMEOUT_MS,_sessionListPrefersReducedMotion); } function _isOptimisticFirstTurnSessionRow(s){ @@ -2135,8 +2127,11 @@ function _applySessionListPayload(sessData, projData){ if (typeof sessData.server_tz === 'string') { _serverTz = sessData.server_tz; } - _reconcileActiveSessionIdleStateFromList(sessData.sessions||[]); - _allSessions = _mergeOptimisticFirstTurnSessions(sessData.sessions||[]); + const serverSessions=_optimisticallyRemovedSessionIds.size + ? (sessData.sessions||[]).filter(s=>s&&!_optimisticallyRemovedSessionIds.has(s.session_id)) + : (sessData.sessions||[]); + _reconcileActiveSessionIdleStateFromList(serverSessions); + _allSessions = _mergeOptimisticFirstTurnSessions(serverSessions); _clearLineageReportCache(); _allProjects = projData.projects||[]; _markPollingCompletionUnreadTransitions(_allSessions); @@ -3039,7 +3034,7 @@ function renderSessionListFromCache(){ _sessionListRefreshAnimationPending=false; const enterAllAnimatedRows=animateRefresh&&_sessionListEnterAllAnimationPending; _sessionListEnterAllAnimationPending=false; - const flipBefore=animateRefresh?_captureSessionListFlipPositions():null; + const flipBefore=animateRefresh?_captureSessionReflowPositions():null; const listScrollTopBeforeRender=list.scrollTop||0; list.innerHTML=''; // Batch select bar (when in select mode) @@ -3680,7 +3675,8 @@ function renderSessionListFromCache(){ const _archiveSwipeActionThreshold=128; const _deleteSwipeActionThreshold=128; const _swipeCancelRatio=0.75; - const _committedSwipeDuration=_sessionPrefersReducedMotion()?0:420; + const _committedSwipeDuration=_sessionPrefersReducedMotion()?0:SESSION_SWIPE_DURATION_MS; + const _committedSwipeReflowDelay=Math.max(0,_committedSwipeDuration-SESSION_SWIPE_REFLOW_LEAD_MS); const _clearLongPressTimer=()=>{ if(_longPressTimer){clearTimeout(_longPressTimer);_longPressTimer=null;} if(!_longPressMenuOpened) el.classList.remove('long-pressing'); @@ -3792,16 +3788,22 @@ function renderSessionListFromCache(){ _tapTimer=null; _lastTapTime=0; if(signedDx>0){ - _completeSessionSwipePaint(signedDx); - setTimeout(async()=>{ - const archived=await _archiveSession(s,!s.archived); - if(!archived) _settleSessionSwipePaint(); - },_committedSwipeDuration); + if(s.archived){ + _settleSessionSwipePaint(); + _archiveSession(s,false,()=>_waitForSessionMotion(_committedSwipeDuration)).then((restored)=>{ + if(!restored) _settleSessionSwipePaint(); + }); + }else{ + _completeSessionSwipePaint(signedDx); + _archiveSession(s,true,()=>_waitForSessionMotion(_committedSwipeReflowDelay)).then((archived)=>{ + if(!archived) _settleSessionSwipePaint(); + }); + } }else if(_canSwipeDeleteSession()){ el.classList.remove('dragging'); deleteSession(s.session_id,async()=>{ _completeSessionSwipePaint(signedDx); - await new Promise(resolve=>setTimeout(resolve,_committedSwipeDuration)); + await _waitForSessionMotion(_committedSwipeReflowDelay); }).then((deleted)=>{ if(!deleted) _settleSessionSwipePaint(); }); @@ -4056,12 +4058,34 @@ async function deleteSession(sid, beforeDelete=null){ }); if(!ok)return false; const reflowPositions=_captureSessionReflowPositions(); - if(beforeDelete) await beforeDelete(); - let response=null; - try{ - response=await api('/api/session/delete',{method:'POST',body:JSON.stringify({session_id:sid})}); + const beforeDeleteHold=beforeDelete?Promise.resolve().then(beforeDelete):null; + const previousSessions=_allSessions; + let optimisticRendered=false; + const deleteRequest=api('/api/session/delete',{method:'POST',body:JSON.stringify({session_id:sid})}).then(response=>{ _clearHandoffStorageForSession(sid); - }catch(e){_pendingSessionReflowPositions=null;setStatus(`Delete failed: ${e.message}`);return false;} + return {response}; + }, error=>({error})); + if(beforeDeleteHold){ + await beforeDeleteHold; + _optimisticallyRemovedSessionIds.add(sid); + _allSessions=(_allSessions||[]).filter(item=>item&&item.session_id!==sid); + _pendingSessionReflowPositions=reflowPositions; + renderSessionListFromCache(); + optimisticRendered=true; + } + const deleteResult=await deleteRequest; + if(deleteResult&&deleteResult.error){ + _pendingSessionReflowPositions=null; + if(optimisticRendered){ + _optimisticallyRemovedSessionIds.delete(sid); + _allSessions=previousSessions; + renderSessionListFromCache(); + } + const err=deleteResult.error; + setStatus(`Delete failed: ${err&&err.message?err.message:String(err)}`); + return false; + } + const response=deleteResult&&deleteResult.response; if(S.session&&S.session.session_id===sid){ S.session=null;S.messages=[];S.entries=[]; localStorage.removeItem('hermes-webui-session'); @@ -4080,8 +4104,11 @@ async function deleteSession(sid, beforeDelete=null){ } } showToast(_sessionResponseRetainsWorktree(response,session)?t('session_deleted_worktree'):t('session_deleted')); - _pendingSessionReflowPositions=reflowPositions; - await renderSessionList(); + if(optimisticRendered) void renderSessionList().finally(()=>_optimisticallyRemovedSessionIds.delete(sid)); + else{ + _pendingSessionReflowPositions=reflowPositions; + await renderSessionList(); + } return true; } diff --git a/static/style.css b/static/style.css index f92dda1664..6168f4df21 100644 --- a/static/style.css +++ b/static/style.css @@ -727,15 +727,10 @@ } .session-item.dragging{transition:background .15s,color .15s,box-shadow .15s ease;} .session-item.session-reflowing{transition:background .15s,color .15s,transform .36s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;will-change:transform;} - .session-item.swipe-committed{transition:background .15s,color .15s,transform .42s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;} + .session-item.swipe-committed, + .session-item.swipe-removing{transition:background .15s,color .15s,transform .42s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;} .session-item.swipe-removing{ - min-height:0!important; - height:0!important; - margin-bottom:0; - padding-top:0; - padding-bottom:0; overflow:hidden; - transition:background .15s,color .15s,transform .42s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease,height .36s cubic-bezier(.2,.8,.2,1),min-height .36s cubic-bezier(.2,.8,.2,1),margin-bottom .36s cubic-bezier(.2,.8,.2,1),padding-top .36s cubic-bezier(.2,.8,.2,1),padding-bottom .36s cubic-bezier(.2,.8,.2,1); } .session-item.swipe-committed .session-swipe-affordance{transition:opacity .18s ease,transform .18s ease;} /* Suppress hover highlight during drag to avoid visual noise mid-scroll */ diff --git a/tests/test_profile_switch_ux.py b/tests/test_profile_switch_ux.py index f7a9dbe1a1..79663922aa 100644 --- a/tests/test_profile_switch_ux.py +++ b/tests/test_profile_switch_ux.py @@ -1,11 +1,10 @@ """ -Tests for profile-switch UX improvements — spinner indicator + parallelized fetches. +Tests for profile-switch UX improvements. -Two changes: -1. switchToProfile() shows a spinner on the profile chip during the async switch, - with an optimistic name update and error revert. -2. loadWorkspaceList() refreshes in the background and the model catalog is - invalidated for lazy refresh instead of holding the visible switch animation open. +Covered behavior: +- switchToProfile() shows a spinner during the async switch and reverts on error. +- Non-visible refresh work runs after the visible switch completes. +- Session-list refreshes animate rows with row-level FLIP motion. """ import re from pathlib import Path @@ -165,22 +164,12 @@ class TestProfileSessionListFlip: JS = (REPO_ROOT / "static" / "sessions.js").read_text(encoding="utf-8") CSS = (REPO_ROOT / "static" / "style.css").read_text(encoding="utf-8") - def test_profile_refresh_captures_row_positions(self): - assert "function _captureSessionListFlipPositions()" in self.JS - start = self.JS.index("function _captureSessionListFlipPositions()") - end = self.JS.index("function _sessionListPrefersReducedMotion()", start) - fn = self.JS[start:end] - assert "querySelectorAll('.session-item[data-sid]')" in fn - assert "positions.set(row.dataset.sid,row.getBoundingClientRect().top);" in fn - def test_profile_refresh_reflows_existing_rows(self): assert "function _playSessionListFlipAnimation(before)" in self.JS start = self.JS.index("function _playSessionListFlipAnimation(before)") end = self.JS.index("function _isOptimisticFirstTurnSessionRow(s)", start) fn = self.JS[start:end] - assert "const delta=oldTop-row.getBoundingClientRect().top;" in fn - assert "row.style.setProperty('--session-reflow-offset',delta+'px');" in fn - assert "row.classList.add('session-reflowing');" in fn + assert "_playSessionRowsReflowFromPositions(before,SESSION_LIST_FLIP_TIMEOUT_MS,_sessionListPrefersReducedMotion);" in fn def test_profile_refresh_flips_new_rows(self): assert "session-list-flip-enter" in self.JS @@ -188,7 +177,7 @@ def test_profile_refresh_flips_new_rows(self): assert "rotateX" in self.CSS def test_profile_refresh_captures_before_render_and_plays_after_rows_exist(self): - capture = self.JS.index("const flipBefore=animateRefresh?_captureSessionListFlipPositions():null;") + capture = self.JS.index("const flipBefore=animateRefresh?_captureSessionReflowPositions():null;") clear = self.JS.index("list.innerHTML='';", capture) row_render = self.JS.index("body.appendChild(_renderOneSession", clear) play = self.JS.index("_playSessionListFlipAnimation(flipBefore);", row_render) diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py index 81e929b079..e901bb622f 100644 --- a/tests/test_session_touch_actions.py +++ b/tests/test_session_touch_actions.py @@ -6,6 +6,18 @@ STYLE_CSS = (ROOT / "static" / "style.css").read_text(encoding="utf-8") +def _block(source: str, start_marker: str, end_marker: str) -> str: + start = source.find(start_marker) + assert start != -1, f"{start_marker!r} not found" + end = source.find(end_marker, start) + assert end != -1, f"{end_marker!r} not found after {start_marker!r}" + return source[start:end] + + +def _sessions_block(start_marker: str, end_marker: str) -> str: + return _block(SESSIONS_JS, start_marker, end_marker) + + def test_session_menu_uses_viewport_height_not_fixed_scroll_cap(): assert "max-height:calc(100vh - 16px)" in STYLE_CSS session_menu = STYLE_CSS[STYLE_CSS.find(".session-action-menu{"):STYLE_CSS.find(".session-action-menu.open")] @@ -69,131 +81,103 @@ def test_open_session_menu_consumes_next_row_activation(): assert "if(_finishSessionGesture(e.clientX,e.clientY,e.target,e.pointerType)) e.stopPropagation();" in SESSIONS_JS[pointerup_idx:] -def test_session_swipes_archive_right_and_delete_left(): +def test_session_swipes_route_archive_restore_and_delete(): assert "_gesturePointerType!=='mouse'" in SESSIONS_JS assert "_swipeTracking=true" in SESSIONS_JS - assert "const _trackHorizontalSwipe=(dx,dy)=>{" in SESSIONS_JS assert "_archiveSwipeActionThreshold=128" in SESSIONS_JS assert "_deleteSwipeActionThreshold=128" in SESSIONS_JS - assert "_committedSwipeDuration=_sessionPrefersReducedMotion()?0:420" in SESSIONS_JS - assert "const _handleSessionSwipe=(signedDx,signedDy)=>{" in SESSIONS_JS + assert "const SESSION_SWIPE_DURATION_MS = 420;" in SESSIONS_JS + assert "const SESSION_SWIPE_REFLOW_LEAD_MS = 180;" in SESSIONS_JS + assert "const _committedSwipeDuration=_sessionPrefersReducedMotion()?0:SESSION_SWIPE_DURATION_MS;" in SESSIONS_JS + assert "const _committedSwipeReflowDelay=Math.max(0,_committedSwipeDuration-SESSION_SWIPE_REFLOW_LEAD_MS);" in SESSIONS_JS + swipe_block = _sessions_block("const _handleSessionSwipe=(signedDx,signedDy)=>{", "const _commitSessionSwipe=()=>{") assert "const actionThreshold=signedDx>0?_archiveSwipeActionThreshold:_deleteSwipeActionThreshold;" in SESSIONS_JS assert "if(Math.abs(signedDx){" in SESSIONS_JS assert "if(_isSessionSwipeTarget()&&(_swipeTracking||dx>dy)) _paintSessionSwipe(signedDx)" in SESSIONS_JS - assert "_updateSessionGesture(e.clientX,e.clientY);" in SESSIONS_JS assert "if(_updateSessionGesture(touch.clientX,touch.clientY)) e.preventDefault();" in SESSIONS_JS assert "_beginSessionGesture(touch.clientX,touch.clientY,'touch');" in SESSIONS_JS - assert "if(signedDx>0){" in SESSIONS_JS - assert "_archiveSession(s,!s.archived)" in SESSIONS_JS - assert "deleteSession(s.session_id,async()=>{" in SESSIONS_JS - delete_branch_start = SESSIONS_JS.find("}else if(_canSwipeDeleteSession()){") - delete_branch_end = SESSIONS_JS.find("}else if(typeof showToast", delete_branch_start) - assert delete_branch_start >= 0 and delete_branch_end > delete_branch_start - delete_branch = SESSIONS_JS[delete_branch_start:delete_branch_end] - delete_call_idx = delete_branch.find("deleteSession(s.session_id,async()=>{") - delete_complete_idx = delete_branch.find("_completeSessionSwipePaint(signedDx);") - assert delete_call_idx > 0 and delete_complete_idx > delete_call_idx - assert "const completedAt=Date.now();" not in delete_branch + restore_start = swipe_block.find("if(s.archived){") + archive_start = swipe_block.find("}else{", restore_start) + delete_start = swipe_block.find("}else if(_canSwipeDeleteSession()){", archive_start) + restore_branch = swipe_block[restore_start:archive_start] + archive_branch = swipe_block[archive_start:delete_start] + delete_branch = swipe_block[delete_start:] + assert "_settleSessionSwipePaint();" in restore_branch + assert "_completeSessionSwipePaint(signedDx);" not in restore_branch + assert "_archiveSession(s,false,()=>_waitForSessionMotion(_committedSwipeDuration))" in restore_branch + assert archive_branch.find("_completeSessionSwipePaint(signedDx);") < archive_branch.find("_archiveSession(s,true,()=>_waitForSessionMotion(_committedSwipeReflowDelay))") + assert delete_branch.find("deleteSession(s.session_id,async()=>{") < delete_branch.find("_completeSessionSwipePaint(signedDx);") assert "showToast('Imported sessions cannot be deleted here.',3000);" in SESSIONS_JS assert "let _gestureState='idle';" in SESSIONS_JS - assert "_gestureState='dragging';" in SESSIONS_JS - assert "const _promoteSessionDrag=(dx,dy)=>{" in SESSIONS_JS assert "const _commitSessionSwipe=()=>{" in SESSIONS_JS - assert "_commitSessionSwipe();" in SESSIONS_JS - assert "const wasDragging=_gestureState==='dragging'||_swipeTracking;" in SESSIONS_JS assert "if(_gestureState==='committed'){" in SESSIONS_JS assert SESSIONS_JS.count("if(e.pointerType==='touch') return;") >= 3 - assert "el.onpointercancel=(e)=>{" in SESSIONS_JS - assert "if(e.pointerType==='touch') return;" in SESSIONS_JS assert "if(_gesturePointerType==='mouse'&&_gestureState!=='idle') _clearPointerDragState();" in SESSIONS_JS -def test_session_swipes_show_visual_feedback_and_touch_load_clears(): - assert "const _paintSessionSwipe=(signedDx)=>{" in SESSIONS_JS - assert "const rawOffset=signedDx*.55" in SESSIONS_JS - assert "const revealedOffset=Math.max(-72,Math.min(72,rawOffset))" in SESSIONS_JS - assert "const overshoot=Math.max(0,Math.abs(rawOffset)-72)" in SESSIONS_JS - assert "Math.sqrt(overshoot)*5" in SESSIONS_JS - assert "el.style.setProperty('--session-swipe-offset',offset+'px')" in SESSIONS_JS - assert "const reveal=Math.min(132,Math.max(36,Math.abs(rawOffset)+24));" in SESSIONS_JS - assert "const iconScale=1+Math.min(.45,Math.max(0,Math.abs(rawOffset)-52)/130);" in SESSIONS_JS - assert "el.style.setProperty('--session-swipe-reveal',reveal+'px')" in SESSIONS_JS - assert "el.style.setProperty('--session-swipe-icon-scale',iconScale)" in SESSIONS_JS - assert "const progress=Math.min(1,Math.abs(revealedOffset)/72)" in SESSIONS_JS - assert "el.style.setProperty('--session-swipe-progress',Math.pow(progress,1.5))" in SESSIONS_JS - assert "const _clearSessionSwipePaint=()=>{" in SESSIONS_JS - assert "el.style.removeProperty('--session-swipe-reveal');" in SESSIONS_JS - assert "el.style.removeProperty('--session-swipe-icon-scale');" in SESSIONS_JS - assert "el.style.removeProperty('height');" in SESSIONS_JS - assert "el.style.removeProperty('min-height');" in SESSIONS_JS - assert "el.classList.remove('swiping-right','swiping-left','swipe-committed','swipe-removing')" in SESSIONS_JS - assert "const _settleSessionSwipePaint=()=>{" in SESSIONS_JS - assert "const _completeSessionSwipePaint=(signedDx)=>{" in SESSIONS_JS - assert "el.classList.remove('dragging');" in SESSIONS_JS - assert "el.classList.add('swipe-committed')" in SESSIONS_JS - assert "el.style.height=rect.height+'px'" in SESSIONS_JS - assert "requestAnimationFrame(()=>el.classList.add('swipe-removing'))" in SESSIONS_JS - assert "el.style.setProperty('--session-swipe-progress','0')" in SESSIONS_JS - assert "deleteSession(s.session_id,async()=>{" in SESSIONS_JS - assert "const archived=await _archiveSession(s,!s.archived);" in SESSIONS_JS - assert "if(!archived) _settleSessionSwipePaint();" in SESSIONS_JS - assert "await new Promise(resolve=>setTimeout(resolve,_committedSwipeDuration));" in SESSIONS_JS - assert "async function deleteSession(sid, beforeDelete=null){" in SESSIONS_JS - assert "if(beforeDelete) await beforeDelete();" in SESSIONS_JS +def test_session_swipe_paint_uses_transform_only_exit(): + paint = _sessions_block("const _paintSessionSwipe=(signedDx)=>{", "const _clearSessionSwipePaint=()=>{") + clear = _sessions_block("const _clearSessionSwipePaint=()=>{", "const _settleSessionSwipePaint=()=>{") + complete = _sessions_block("const _completeSessionSwipePaint=(signedDx)=>{", "const _handleSessionSwipe=(signedDx,signedDy)=>{") + assert "--session-swipe-offset" in paint + assert "--session-swipe-reveal" in paint + assert "--session-swipe-progress" in paint + assert "window.innerWidth+'px'" in complete + assert "el.style.height=rect.height+'px'" in complete + assert "requestAnimationFrame(()=>el.classList.add('swipe-removing'))" in complete assert "requestAnimationFrame(()=>requestAnimationFrame(_clearSessionSwipePaint))" in SESSIONS_JS - assert ".session-item.swiping-right" in STYLE_CSS - assert ".session-item.swiping-left" in STYLE_CSS - assert "const _makeSessionSwipeAffordance=(side,icon,label)=>{" in SESSIONS_JS - assert "affordance.setAttribute('aria-hidden','true');" in SESSIONS_JS - assert "_makeSessionSwipeAffordance('right',s.archived?'undo':'archive',s.archived?'Restore':t('session_batch_archive'))" in SESSIONS_JS - assert "_makeSessionSwipeAffordance('left','trash-2'" in SESSIONS_JS - assert ".session-swipe-affordance{" in STYLE_CSS - assert "opacity:var(--session-swipe-progress,0)" in STYLE_CSS - assert "width:var(--session-swipe-reveal,0px)" in STYLE_CSS - assert ".session-item.swiping-right{background:color-mix(in srgb,var(--warning) 16%,var(--surface));box-shadow:0 0 0 1px color-mix(in srgb,var(--warning) 48%,transparent);}" in STYLE_CSS - assert ".session-item.swiping-left{background:color-mix(in srgb,var(--error) 14%,var(--surface));box-shadow:0 0 0 1px color-mix(in srgb,var(--error) 48%,transparent);}" in STYLE_CSS - assert "background:var(--warning)" in STYLE_CSS - assert ".session-item.archived .session-swipe-affordance-right{background:var(--success);}" in STYLE_CSS - assert ".session-item.archived.dragging.swiping-right" in STYLE_CSS - assert ".session-item.active.archived.swiping-right{background:color-mix(in srgb,var(--success) 20%,var(--accent-bg));}" in STYLE_CSS - assert "background:var(--error)" in STYLE_CSS - assert ".session-item.swiping-right .session-swipe-affordance-right" in STYLE_CSS - assert ".session-item.swiping-left .session-swipe-affordance-left" in STYLE_CSS + assert "el.classList.remove('swiping-right','swiping-left','swipe-committed','swipe-removing')" in clear + assert ".session-item.swipe-committed,\n .session-item.swipe-removing{transition:" in STYLE_CSS assert "transform:translateX(calc(-1 * var(--session-swipe-offset,0px))) scale(calc(.82 + var(--session-swipe-progress,0) * .18))" in STYLE_CSS - assert ".session-swipe-badge{" in STYLE_CSS - assert "transform:scaleX(var(--session-swipe-icon-scale,1))" in STYLE_CSS - assert ".session-swipe-label{" in STYLE_CSS - assert "transform .5s cubic-bezier(.2,.8,.2,1)" in STYLE_CSS - assert ".session-item.dragging.swiping-right" in STYLE_CSS - assert ".session-item.dragging.swiping-left" in STYLE_CSS - assert ".session-item.dragging{transition:background .15s,color .15s,box-shadow .15s ease;}" in STYLE_CSS - assert ".session-item.swipe-committed" in STYLE_CSS - assert ".session-item.swipe-removing{" in STYLE_CSS - assert "height .36s cubic-bezier(.2,.8,.2,1)" in STYLE_CSS - assert "transform .42s cubic-bezier(.2,.8,.2,1)" in STYLE_CSS - assert ".session-item.swipe-committed .session-swipe-affordance{transition:opacity .18s ease,transform .18s ease;}" in STYLE_CSS - assert ".session-item.long-pressing" in STYLE_CSS - assert "@keyframes session-long-press" in STYLE_CSS + swipe_start = STYLE_CSS.find(".session-item.swipe-removing{") + swipe_end = STYLE_CSS.find("}", swipe_start) + assert swipe_start >= 0 and swipe_end > swipe_start + swipe_removing = STYLE_CSS[swipe_start:swipe_end] + assert "height:0" not in swipe_removing + assert "padding-top:0" not in swipe_removing + assert "margin-bottom:0" not in swipe_removing assert "transform:translateX(var(--session-swipe-offset,0))" in STYLE_CSS - assert "finally{" in SESSIONS_JS - assert "el.classList.remove('loading');" in SESSIONS_JS def test_session_removal_reflows_surviving_rows_smoothly(): assert "let _pendingSessionReflowPositions = null;" in SESSIONS_JS - assert "function _captureSessionReflowPositions(){" in SESSIONS_JS - assert "positions.set(row.dataset.sid,row.getBoundingClientRect().top);" in SESSIONS_JS - assert "function _playQueuedSessionReflowAnimation(){" in SESSIONS_JS - assert "function _sessionPrefersReducedMotion(){" in SESSIONS_JS - assert "const delta=oldTop-row.getBoundingClientRect().top;" in SESSIONS_JS - assert "row.style.setProperty('--session-reflow-offset',delta+'px')" in SESSIONS_JS - assert "row.classList.add('session-reflowing')" in SESSIONS_JS - assert "row.style.setProperty('--session-reflow-offset','0px')" in SESSIONS_JS - assert "const reflowPositions=_captureSessionReflowPositions();" in SESSIONS_JS + assert "const _optimisticallyRemovedSessionIds = new Set();" in SESSIONS_JS + capture = _sessions_block("function _captureSessionReflowPositions(){", "function _waitForSessionMotion") + helper = _sessions_block("function _playSessionRowsReflowFromPositions", "function _playQueuedSessionReflowAnimation") + assert "positions.set(row.dataset.sid,row.getBoundingClientRect().top);" in capture + assert "const delta=oldTop-row.getBoundingClientRect().top;" in helper + assert "const movingRows=[];" in helper + assert "list.getBoundingClientRect();" in helper + assert helper.count("getBoundingClientRect()") == 2 + assert "row.style.transition='none';" in helper + assert "row.classList.add('session-reflowing')" in helper + assert "requestAnimationFrame(()=>requestAnimationFrame(()=>{" in helper assert SESSIONS_JS.count("_pendingSessionReflowPositions=reflowPositions;") >= 2 + assert "_playSessionRowsReflowFromPositions(before,SESSION_REFLOW_TIMEOUT_MS,_sessionPrefersReducedMotion);" in SESSIONS_JS + assert "_playSessionRowsReflowFromPositions(before,SESSION_LIST_FLIP_TIMEOUT_MS,_sessionListPrefersReducedMotion);" in SESSIONS_JS + assert "async function _archiveSession(session, archived=true, beforeListRender=null){" in SESSIONS_JS + assert "const renderHold=beforeListRender?Promise.resolve().then(beforeListRender):null;" in SESSIONS_JS + assert "if(renderHold) await renderHold;" in SESSIONS_JS + assert "const serverSessions=_optimisticallyRemovedSessionIds.size" in SESSIONS_JS + assert "? (sessData.sessions||[]).filter(s=>s&&!_optimisticallyRemovedSessionIds.has(s.session_id))" in SESSIONS_JS assert "_playQueuedSessionReflowAnimation();" in SESSIONS_JS assert ".session-item.session-reflowing{transition:background .15s,color .15s,transform .36s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;will-change:transform;}" in STYLE_CSS + delete_start = SESSIONS_JS.find("async function deleteSession(sid, beforeDelete=null){") + delete_end = SESSIONS_JS.find("// ── Project helpers", delete_start) + assert delete_start >= 0 and delete_end > delete_start + delete_body = SESSIONS_JS[delete_start:delete_end] + hold_start = delete_body.find("const beforeDeleteHold=beforeDelete?Promise.resolve().then(beforeDelete):null;") + delete_request = delete_body.find("const deleteRequest=api('/api/session/delete'") + hold_await = delete_body.find("await beforeDeleteHold;", hold_start) + optimistic_set = delete_body.find("_optimisticallyRemovedSessionIds.add(sid);") + optimistic_filter = delete_body.find("_allSessions=(_allSessions||[]).filter") + optimistic_render = delete_body.find("renderSessionListFromCache();", optimistic_filter) + response_await = delete_body.find("const deleteResult=await deleteRequest;") + rollback = delete_body.find("_optimisticallyRemovedSessionIds.delete(sid);") + final_render = delete_body.find("void renderSessionList().finally(()=>_optimisticallyRemovedSessionIds.delete(sid));") + assert delete_body.find("const reflowPositions=_captureSessionReflowPositions();") < hold_start < delete_request < hold_await < optimistic_set < optimistic_filter < optimistic_render < response_await < rollback < final_render + assert "}, error=>({error}));" in delete_body def test_ios_touch_events_drive_session_swipes(): From a277bbd42c80b1b77ff600f420f6525d1665b7e2 Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Thu, 21 May 2026 07:41:08 -0600 Subject: [PATCH 016/349] refactor --- static/sessions.js | 44 ++++++++--------------------- static/style.css | 6 ++-- tests/test_profile_switch_ux.py | 29 ++++++------------- tests/test_session_touch_actions.py | 18 ++++++------ 4 files changed, 32 insertions(+), 65 deletions(-) diff --git a/static/sessions.js b/static/sessions.js index e7a2479acf..435e481ae7 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -1515,16 +1515,6 @@ function _playSessionRowsReflowFromPositions(before, timeoutMs, prefersReducedMo }); } -function _playQueuedSessionReflowAnimation(){ - const before=_pendingSessionReflowPositions; - _pendingSessionReflowPositions=null; - _playSessionRowsReflowFromPositions(before,SESSION_REFLOW_TIMEOUT_MS,_sessionPrefersReducedMotion); -} - -function _discardQueuedSessionReflowAnimation(){ - _pendingSessionReflowPositions=null; -} - function _sessionPrefersReducedMotion(){ return Boolean(window.matchMedia&&window.matchMedia('(prefers-reduced-motion: reduce)').matches); } @@ -2028,15 +2018,6 @@ function animateNextSessionListRefresh(options={}){ if(options&&options.enterAll) _sessionListEnterAllAnimationPending = true; } -function _sessionListPrefersReducedMotion(){ - try{return window.matchMedia&&window.matchMedia('(prefers-reduced-motion: reduce)').matches;} - catch(_){return false;} -} - -function _playSessionListFlipAnimation(before){ - _playSessionRowsReflowFromPositions(before,SESSION_LIST_FLIP_TIMEOUT_MS,_sessionListPrefersReducedMotion); -} - function _isOptimisticFirstTurnSessionRow(s){ if(!s||!s.session_id||s.archived) return false; const messageCount=Number(s.message_count||0); @@ -3035,6 +3016,8 @@ function renderSessionListFromCache(){ const enterAllAnimatedRows=animateRefresh&&_sessionListEnterAllAnimationPending; _sessionListEnterAllAnimationPending=false; const flipBefore=animateRefresh?_captureSessionReflowPositions():null; + const committedSwipeDuration=_sessionPrefersReducedMotion()?0:SESSION_SWIPE_DURATION_MS; + const committedSwipeReflowDelay=Math.max(0,committedSwipeDuration-SESSION_SWIPE_REFLOW_LEAD_MS); const listScrollTopBeforeRender=list.scrollTop||0; list.innerHTML=''; // Batch select bar (when in select mode) @@ -3273,15 +3256,12 @@ function renderSessionListFromCache(){ toggleBtn.onclick=(e)=>{e.stopPropagation();toggleSessionSelectMode();}; list.appendChild(toggleBtn); } - if(animateRefresh){ - // Refresh FLIP and queued archive/delete reflow both drive - // --session-reflow-offset. Refresh wins so one render has one transform - // writer. - _discardQueuedSessionReflowAnimation(); - _playSessionListFlipAnimation(flipBefore); - }else{ - _playQueuedSessionReflowAnimation(); - } + // Refresh FLIP and queued archive/delete reflow both drive + // --session-reflow-offset. Refresh wins so one render has one transform writer. + const reflowBefore=animateRefresh?flipBefore:_pendingSessionReflowPositions; + const reflowTimeout=animateRefresh?SESSION_LIST_FLIP_TIMEOUT_MS:SESSION_REFLOW_TIMEOUT_MS; + _pendingSessionReflowPositions=null; + _playSessionRowsReflowFromPositions(reflowBefore,reflowTimeout,_sessionPrefersReducedMotion); // Note: declared after the groups loop but available via function hoisting. function _renderOneSession(s, isPinnedGroup=false){ const el=document.createElement('div'); @@ -3675,8 +3655,6 @@ function renderSessionListFromCache(){ const _archiveSwipeActionThreshold=128; const _deleteSwipeActionThreshold=128; const _swipeCancelRatio=0.75; - const _committedSwipeDuration=_sessionPrefersReducedMotion()?0:SESSION_SWIPE_DURATION_MS; - const _committedSwipeReflowDelay=Math.max(0,_committedSwipeDuration-SESSION_SWIPE_REFLOW_LEAD_MS); const _clearLongPressTimer=()=>{ if(_longPressTimer){clearTimeout(_longPressTimer);_longPressTimer=null;} if(!_longPressMenuOpened) el.classList.remove('long-pressing'); @@ -3790,12 +3768,12 @@ function renderSessionListFromCache(){ if(signedDx>0){ if(s.archived){ _settleSessionSwipePaint(); - _archiveSession(s,false,()=>_waitForSessionMotion(_committedSwipeDuration)).then((restored)=>{ + _archiveSession(s,false,()=>_waitForSessionMotion(committedSwipeDuration)).then((restored)=>{ if(!restored) _settleSessionSwipePaint(); }); }else{ _completeSessionSwipePaint(signedDx); - _archiveSession(s,true,()=>_waitForSessionMotion(_committedSwipeReflowDelay)).then((archived)=>{ + _archiveSession(s,true,()=>_waitForSessionMotion(committedSwipeReflowDelay)).then((archived)=>{ if(!archived) _settleSessionSwipePaint(); }); } @@ -3803,7 +3781,7 @@ function renderSessionListFromCache(){ el.classList.remove('dragging'); deleteSession(s.session_id,async()=>{ _completeSessionSwipePaint(signedDx); - await _waitForSessionMotion(_committedSwipeReflowDelay); + await _waitForSessionMotion(committedSwipeReflowDelay); }).then((deleted)=>{ if(!deleted) _settleSessionSwipePaint(); }); diff --git a/static/style.css b/static/style.css index 6168f4df21..efe39142d0 100644 --- a/static/style.css +++ b/static/style.css @@ -725,10 +725,10 @@ font-weight:600; line-height:1; } - .session-item.dragging{transition:background .15s,color .15s,box-shadow .15s ease;} + .session-item.dragging{transition:background .15s,color .15s,box-shadow .15s ease;will-change:transform;} .session-item.session-reflowing{transition:background .15s,color .15s,transform .36s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;will-change:transform;} .session-item.swipe-committed, - .session-item.swipe-removing{transition:background .15s,color .15s,transform .42s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;} + .session-item.swipe-removing{transition:background .15s,color .15s,transform .42s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;will-change:transform;} .session-item.swipe-removing{ overflow:hidden; } @@ -822,7 +822,7 @@ .session-action-opt.danger .ws-opt-icon,.session-action-opt.danger .ws-opt-name{color:var(--error);} @media (prefers-reduced-motion:reduce){ .session-action-menu{animation:none;will-change:auto;} - .session-item,.session-item.session-reflowing,.session-item.swipe-committed,.session-item.swipe-removing{transition:none;} + .session-item,.session-item.dragging,.session-item.session-reflowing,.session-item.swipe-committed,.session-item.swipe-removing{transition:none;} .session-item.long-pressing{animation:none;} .session-item.session-list-flip-enter{animation:none;} } diff --git a/tests/test_profile_switch_ux.py b/tests/test_profile_switch_ux.py index 79663922aa..9dbe659776 100644 --- a/tests/test_profile_switch_ux.py +++ b/tests/test_profile_switch_ux.py @@ -164,44 +164,33 @@ class TestProfileSessionListFlip: JS = (REPO_ROOT / "static" / "sessions.js").read_text(encoding="utf-8") CSS = (REPO_ROOT / "static" / "style.css").read_text(encoding="utf-8") - def test_profile_refresh_reflows_existing_rows(self): - assert "function _playSessionListFlipAnimation(before)" in self.JS - start = self.JS.index("function _playSessionListFlipAnimation(before)") - end = self.JS.index("function _isOptimisticFirstTurnSessionRow(s)", start) - fn = self.JS[start:end] - assert "_playSessionRowsReflowFromPositions(before,SESSION_LIST_FLIP_TIMEOUT_MS,_sessionListPrefersReducedMotion);" in fn - def test_profile_refresh_flips_new_rows(self): assert "session-list-flip-enter" in self.JS assert "@keyframes sessionListFlipIn" in self.CSS - assert "rotateX" in self.CSS def test_profile_refresh_captures_before_render_and_plays_after_rows_exist(self): capture = self.JS.index("const flipBefore=animateRefresh?_captureSessionReflowPositions():null;") clear = self.JS.index("list.innerHTML='';", capture) row_render = self.JS.index("body.appendChild(_renderOneSession", clear) - play = self.JS.index("_playSessionListFlipAnimation(flipBefore);", row_render) + play = self.JS.index("_playSessionRowsReflowFromPositions(reflowBefore,reflowTimeout,_sessionPrefersReducedMotion);", row_render) assert capture < clear < row_render < play def test_profile_refresh_drops_queued_reflow_before_playing_flip(self): - assert "function _discardQueuedSessionReflowAnimation(){" in self.JS - start = self.JS.index("if(animateRefresh){") + start = self.JS.index("// Refresh FLIP and queued archive/delete reflow both drive") end = self.JS.index("// Note: declared after the groups loop", start) block = self.JS[start:end] - assert "_discardQueuedSessionReflowAnimation();" in block - assert "_playSessionListFlipAnimation(flipBefore);" in block - assert "_playQueuedSessionReflowAnimation();" in block - assert block.index("_discardQueuedSessionReflowAnimation();") < block.index("_playSessionListFlipAnimation(flipBefore);") - assert block.index("_playSessionListFlipAnimation(flipBefore);") < block.index("_playQueuedSessionReflowAnimation();") + assert "const reflowBefore=animateRefresh?flipBefore:_pendingSessionReflowPositions;" in block + assert "const reflowTimeout=animateRefresh?SESSION_LIST_FLIP_TIMEOUT_MS:SESSION_REFLOW_TIMEOUT_MS;" in block + assert "_pendingSessionReflowPositions=null;" in block + assert "_playSessionRowsReflowFromPositions(reflowBefore,reflowTimeout,_sessionPrefersReducedMotion);" in block + assert block.index("const reflowBefore=animateRefresh?flipBefore:_pendingSessionReflowPositions;") < block.index("const reflowTimeout=animateRefresh?SESSION_LIST_FLIP_TIMEOUT_MS:SESSION_REFLOW_TIMEOUT_MS;") + assert block.index("const reflowTimeout=animateRefresh?SESSION_LIST_FLIP_TIMEOUT_MS:SESSION_REFLOW_TIMEOUT_MS;") < block.index("_pendingSessionReflowPositions=null;") + assert block.index("_pendingSessionReflowPositions=null;") < block.index("_playSessionRowsReflowFromPositions(reflowBefore,reflowTimeout,_sessionPrefersReducedMotion);") def test_first_non_empty_session_render_is_animated(self): assert "_sessionListFirstRenderAnimated" in self.JS assert "animateNextSessionListRefresh({enterAll:true});" in self.JS assert "_sessionListFirstRenderAnimated=true;" in self.JS - assert "if(S&&S._bootReady) _sessionListFirstRenderAnimated=true;" not in self.JS assert "enterAllAnimatedRows" in self.JS - - def test_profile_refresh_is_not_whole_list_fade(self): - assert "session-list.profile-refresh" not in self.CSS diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py index e901bb622f..bb061463a3 100644 --- a/tests/test_session_touch_actions.py +++ b/tests/test_session_touch_actions.py @@ -37,7 +37,7 @@ def test_session_menu_has_subtle_open_animation(): assert "@keyframes session-menu-in" in STYLE_CSS assert "@media (prefers-reduced-motion:reduce)" in STYLE_CSS assert ".session-action-menu{animation:none;will-change:auto;}" in STYLE_CSS - assert ".session-item,.session-item.session-reflowing,.session-item.swipe-committed,.session-item.swipe-removing{transition:none;}" in STYLE_CSS + assert ".session-item,.session-item.dragging,.session-item.session-reflowing,.session-item.swipe-committed,.session-item.swipe-removing{transition:none;}" in STYLE_CSS assert ".session-item.long-pressing{animation:none;}" in STYLE_CSS @@ -88,8 +88,8 @@ def test_session_swipes_route_archive_restore_and_delete(): assert "_deleteSwipeActionThreshold=128" in SESSIONS_JS assert "const SESSION_SWIPE_DURATION_MS = 420;" in SESSIONS_JS assert "const SESSION_SWIPE_REFLOW_LEAD_MS = 180;" in SESSIONS_JS - assert "const _committedSwipeDuration=_sessionPrefersReducedMotion()?0:SESSION_SWIPE_DURATION_MS;" in SESSIONS_JS - assert "const _committedSwipeReflowDelay=Math.max(0,_committedSwipeDuration-SESSION_SWIPE_REFLOW_LEAD_MS);" in SESSIONS_JS + assert "const committedSwipeDuration=_sessionPrefersReducedMotion()?0:SESSION_SWIPE_DURATION_MS;" in SESSIONS_JS + assert "const committedSwipeReflowDelay=Math.max(0,committedSwipeDuration-SESSION_SWIPE_REFLOW_LEAD_MS);" in SESSIONS_JS swipe_block = _sessions_block("const _handleSessionSwipe=(signedDx,signedDy)=>{", "const _commitSessionSwipe=()=>{") assert "const actionThreshold=signedDx>0?_archiveSwipeActionThreshold:_deleteSwipeActionThreshold;" in SESSIONS_JS assert "if(Math.abs(signedDx)_waitForSessionMotion(_committedSwipeDuration))" in restore_branch - assert archive_branch.find("_completeSessionSwipePaint(signedDx);") < archive_branch.find("_archiveSession(s,true,()=>_waitForSessionMotion(_committedSwipeReflowDelay))") + assert "_archiveSession(s,false,()=>_waitForSessionMotion(committedSwipeDuration))" in restore_branch + assert archive_branch.find("_completeSessionSwipePaint(signedDx);") < archive_branch.find("_archiveSession(s,true,()=>_waitForSessionMotion(committedSwipeReflowDelay))") assert delete_branch.find("deleteSession(s.session_id,async()=>{") < delete_branch.find("_completeSessionSwipePaint(signedDx);") assert "showToast('Imported sessions cannot be deleted here.',3000);" in SESSIONS_JS assert "let _gestureState='idle';" in SESSIONS_JS @@ -144,7 +144,7 @@ def test_session_removal_reflows_surviving_rows_smoothly(): assert "let _pendingSessionReflowPositions = null;" in SESSIONS_JS assert "const _optimisticallyRemovedSessionIds = new Set();" in SESSIONS_JS capture = _sessions_block("function _captureSessionReflowPositions(){", "function _waitForSessionMotion") - helper = _sessions_block("function _playSessionRowsReflowFromPositions", "function _playQueuedSessionReflowAnimation") + helper = _sessions_block("function _playSessionRowsReflowFromPositions", "function _sessionPrefersReducedMotion") assert "positions.set(row.dataset.sid,row.getBoundingClientRect().top);" in capture assert "const delta=oldTop-row.getBoundingClientRect().top;" in helper assert "const movingRows=[];" in helper @@ -154,14 +154,14 @@ def test_session_removal_reflows_surviving_rows_smoothly(): assert "row.classList.add('session-reflowing')" in helper assert "requestAnimationFrame(()=>requestAnimationFrame(()=>{" in helper assert SESSIONS_JS.count("_pendingSessionReflowPositions=reflowPositions;") >= 2 - assert "_playSessionRowsReflowFromPositions(before,SESSION_REFLOW_TIMEOUT_MS,_sessionPrefersReducedMotion);" in SESSIONS_JS - assert "_playSessionRowsReflowFromPositions(before,SESSION_LIST_FLIP_TIMEOUT_MS,_sessionListPrefersReducedMotion);" in SESSIONS_JS + assert "const reflowBefore=animateRefresh?flipBefore:_pendingSessionReflowPositions;" in SESSIONS_JS + assert "const reflowTimeout=animateRefresh?SESSION_LIST_FLIP_TIMEOUT_MS:SESSION_REFLOW_TIMEOUT_MS;" in SESSIONS_JS + assert "_playSessionRowsReflowFromPositions(reflowBefore,reflowTimeout,_sessionPrefersReducedMotion);" in SESSIONS_JS assert "async function _archiveSession(session, archived=true, beforeListRender=null){" in SESSIONS_JS assert "const renderHold=beforeListRender?Promise.resolve().then(beforeListRender):null;" in SESSIONS_JS assert "if(renderHold) await renderHold;" in SESSIONS_JS assert "const serverSessions=_optimisticallyRemovedSessionIds.size" in SESSIONS_JS assert "? (sessData.sessions||[]).filter(s=>s&&!_optimisticallyRemovedSessionIds.has(s.session_id))" in SESSIONS_JS - assert "_playQueuedSessionReflowAnimation();" in SESSIONS_JS assert ".session-item.session-reflowing{transition:background .15s,color .15s,transform .36s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;will-change:transform;}" in STYLE_CSS delete_start = SESSIONS_JS.find("async function deleteSession(sid, beforeDelete=null){") delete_end = SESSIONS_JS.find("// ── Project helpers", delete_start) From c4fffff2057d9c6cb5d2ef74a4d630412d09dc74 Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Thu, 21 May 2026 07:52:42 -0600 Subject: [PATCH 017/349] refine archive/restore animations --- static/sessions.js | 21 +++++++++++++++++++-- static/style.css | 10 ++++++---- tests/test_session_touch_actions.py | 23 ++++++++++++++++++----- 3 files changed, 43 insertions(+), 11 deletions(-) diff --git a/static/sessions.js b/static/sessions.js index 435e481ae7..decb50ec0a 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -107,8 +107,8 @@ let _sessionListLastScrollAt = 0; let _pendingSessionListPayload = null; let _pendingSessionListApplyTimer = 0; const SESSION_LIST_INTERACTION_IDLE_MS = 700; -const SESSION_SWIPE_DURATION_MS = 420; -const SESSION_SWIPE_REFLOW_LEAD_MS = 180; +const SESSION_SWIPE_DURATION_MS = 500; +const SESSION_SWIPE_REFLOW_LEAD_MS = 220; const SESSION_REFLOW_TIMEOUT_MS = 420; const SESSION_LIST_FLIP_TIMEOUT_MS = 460; @@ -1459,6 +1459,7 @@ let _lineageReportCacheGeneration = 0; let _sessionVisibleSidebarIds = []; let _pendingSessionReflowPositions = null; const _optimisticallyRemovedSessionIds = new Set(); +const _sessionSwipeReturnOffsets = new Map(); function _captureSessionReflowPositions(){ const list=$('sessionList'); @@ -1834,6 +1835,7 @@ async function _archiveSession(session, archived=true, beforeListRender=null){ session.archived=archived; if(S.session&&S.session.session_id===session.session_id) S.session.archived=archived; if(renderHold) await renderHold; + if(_showArchived&&!_sessionPrefersReducedMotion()) _sessionSwipeReturnOffsets.set(session.session_id,'0px'); _pendingSessionReflowPositions=reflowPositions; await renderSessionList(); showToast(session.archived?_sessionArchiveToast(response,session):t('session_restored')); @@ -3272,6 +3274,16 @@ function renderSessionListFromCache(){ const hasUnread=_hasUnreadForSession(s)&&!isActive; const readOnly=_isReadOnlySession(s); el.className='session-item'+(isActive?' active':'')+(isActive&&S.session&&S.session._flash?' new-flash':'')+(s.archived?' archived':'')+(isStreaming?' streaming':'')+(hasUnread?' unread':''); + const swipeReturnOffset=_sessionSwipeReturnOffsets.get(s.session_id); + if(swipeReturnOffset!==undefined){ + _sessionSwipeReturnOffsets.delete(s.session_id); + el.style.setProperty('--session-swipe-return-offset',swipeReturnOffset); + el.classList.add('session-swipe-returning'); + el.addEventListener('animationend',()=>{ + el.classList.remove('session-swipe-returning'); + el.style.removeProperty('--session-swipe-return-offset'); + },{once:true}); + } if(animateRefresh&&(enterAllAnimatedRows||!(flipBefore&&flipBefore.has(s.session_id)))){ el.classList.add('session-list-flip-enter'); } @@ -3771,6 +3783,11 @@ function renderSessionListFromCache(){ _archiveSession(s,false,()=>_waitForSessionMotion(committedSwipeDuration)).then((restored)=>{ if(!restored) _settleSessionSwipePaint(); }); + }else if(_showArchived){ + _settleSessionSwipePaint(); + _archiveSession(s,true,()=>_waitForSessionMotion(committedSwipeDuration)).then((archived)=>{ + if(!archived) _settleSessionSwipePaint(); + }); }else{ _completeSessionSwipePaint(signedDx); _archiveSession(s,true,()=>_waitForSessionMotion(committedSwipeReflowDelay)).then((archived)=>{ diff --git a/static/style.css b/static/style.css index efe39142d0..b3a3fd0c6e 100644 --- a/static/style.css +++ b/static/style.css @@ -654,7 +654,7 @@ and attention indicator (26x26 at right:6px) still need 40px reserved when they're visible — covered by the hover / streaming / unread / menu-open / focus-within rule below. */ - .session-item{padding:8px 8px;margin-bottom:2px;border-radius:8px;cursor:pointer;font-size:13px;color:var(--muted);transition:background .15s,color .15s,transform .5s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;display:flex;align-items:flex-start;gap:8px;min-width:0;position:relative;touch-action:pan-y;-webkit-tap-highlight-color:transparent;user-select:none;-webkit-user-select:none;-webkit-touch-callout:none;transform:translateX(var(--session-swipe-offset,0)) translateY(var(--session-reflow-offset,0));} + .session-item{padding:8px 8px;margin-bottom:2px;border-radius:8px;cursor:pointer;font-size:13px;color:var(--muted);transition:background .15s,color .15s,transform .5s cubic-bezier(.22,.61,.36,1),box-shadow .15s ease;display:flex;align-items:flex-start;gap:8px;min-width:0;position:relative;touch-action:pan-y;-webkit-tap-highlight-color:transparent;user-select:none;-webkit-user-select:none;-webkit-touch-callout:none;transform:translate3d(var(--session-swipe-offset,0),var(--session-reflow-offset,0),0);} .session-item.streaming,.session-item.unread,.session-item:focus-within,.session-item.menu-open{padding-right:40px;} @media (hover:hover){.session-item:hover{background:var(--hover-bg);color:var(--text);}} .session-item.loading{background:var(--hover-bg);color:var(--text);} @@ -681,7 +681,7 @@ box-sizing:border-box; opacity:0; overflow:hidden; - transform:translateX(calc(-1 * var(--session-swipe-offset,0px))) scale(calc(.82 + var(--session-swipe-progress,0) * .18)); + transform:translate3d(calc(-1 * var(--session-swipe-offset,0px)),0,0) scale(calc(.82 + var(--session-swipe-progress,0) * .18)); pointer-events:none; z-index:0; } @@ -728,10 +728,11 @@ .session-item.dragging{transition:background .15s,color .15s,box-shadow .15s ease;will-change:transform;} .session-item.session-reflowing{transition:background .15s,color .15s,transform .36s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;will-change:transform;} .session-item.swipe-committed, - .session-item.swipe-removing{transition:background .15s,color .15s,transform .42s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;will-change:transform;} + .session-item.swipe-removing{transition:background .15s,color .15s,transform .5s cubic-bezier(.22,.61,.36,1),box-shadow .15s ease;will-change:transform;} .session-item.swipe-removing{ overflow:hidden; } + .session-item.session-swipe-returning{animation:sessionSwipeReturn .5s cubic-bezier(.22,.61,.36,1) both;will-change:transform,opacity;} .session-item.swipe-committed .session-swipe-affordance{transition:opacity .18s ease,transform .18s ease;} /* Suppress hover highlight during drag to avoid visual noise mid-scroll */ .session-item.dragging:hover{background:transparent;color:var(--muted);} @@ -823,13 +824,14 @@ @media (prefers-reduced-motion:reduce){ .session-action-menu{animation:none;will-change:auto;} .session-item,.session-item.dragging,.session-item.session-reflowing,.session-item.swipe-committed,.session-item.swipe-removing{transition:none;} - .session-item.long-pressing{animation:none;} + .session-item.long-pressing,.session-item.session-swipe-returning{animation:none;} .session-item.session-list-flip-enter{animation:none;} } /* Hide overlay during inline rename */ .session-item:has(.session-title-input) .session-actions{display:none;} @keyframes session-menu-in{from{opacity:0;transform:translate3d(0,-4px,0) scale(.985);}to{opacity:1;transform:translate3d(0,0,0) scale(1);}} @keyframes session-long-press{from{filter:brightness(1);}to{filter:brightness(1.08);}} + @keyframes sessionSwipeReturn{0%{opacity:.62;transform:translate3d(var(--session-swipe-return-offset,32px),var(--session-reflow-offset,0),0) scale(.985);}100%{opacity:1;transform:translate3d(0,var(--session-reflow-offset,0),0) scale(1);}} @keyframes newflash{0%{background:var(--accent-bg-strong);color:var(--accent);}100%{background:transparent;color:var(--muted);}} @keyframes sessionListFlipIn{0%{opacity:0;transform:perspective(700px) rotateX(-8deg) translateY(10px) scale(.985);}100%{opacity:1;transform:perspective(700px) rotateX(0) translateY(0) scale(1);}} @keyframes spin{to{transform:rotate(360deg);}} diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py index bb061463a3..0e9e36e4a9 100644 --- a/tests/test_session_touch_actions.py +++ b/tests/test_session_touch_actions.py @@ -38,7 +38,7 @@ def test_session_menu_has_subtle_open_animation(): assert "@media (prefers-reduced-motion:reduce)" in STYLE_CSS assert ".session-action-menu{animation:none;will-change:auto;}" in STYLE_CSS assert ".session-item,.session-item.dragging,.session-item.session-reflowing,.session-item.swipe-committed,.session-item.swipe-removing{transition:none;}" in STYLE_CSS - assert ".session-item.long-pressing{animation:none;}" in STYLE_CSS + assert ".session-item.long-pressing,.session-item.session-swipe-returning{animation:none;}" in STYLE_CSS def test_mobile_session_menu_opens_from_long_press_and_hides_dots(): @@ -86,8 +86,8 @@ def test_session_swipes_route_archive_restore_and_delete(): assert "_swipeTracking=true" in SESSIONS_JS assert "_archiveSwipeActionThreshold=128" in SESSIONS_JS assert "_deleteSwipeActionThreshold=128" in SESSIONS_JS - assert "const SESSION_SWIPE_DURATION_MS = 420;" in SESSIONS_JS - assert "const SESSION_SWIPE_REFLOW_LEAD_MS = 180;" in SESSIONS_JS + assert "const SESSION_SWIPE_DURATION_MS = 500;" in SESSIONS_JS + assert "const SESSION_SWIPE_REFLOW_LEAD_MS = 220;" in SESSIONS_JS assert "const committedSwipeDuration=_sessionPrefersReducedMotion()?0:SESSION_SWIPE_DURATION_MS;" in SESSIONS_JS assert "const committedSwipeReflowDelay=Math.max(0,committedSwipeDuration-SESSION_SWIPE_REFLOW_LEAD_MS);" in SESSIONS_JS swipe_block = _sessions_block("const _handleSessionSwipe=(signedDx,signedDy)=>{", "const _commitSessionSwipe=()=>{") @@ -106,6 +106,12 @@ def test_session_swipes_route_archive_restore_and_delete(): assert "_settleSessionSwipePaint();" in restore_branch assert "_completeSessionSwipePaint(signedDx);" not in restore_branch assert "_archiveSession(s,false,()=>_waitForSessionMotion(committedSwipeDuration))" in restore_branch + archived_visible_start = swipe_block.find("}else if(_showArchived){") + assert archived_visible_start > restore_start + archived_visible_branch = swipe_block[archived_visible_start:archive_start] + assert "_settleSessionSwipePaint();" in archived_visible_branch + assert "_completeSessionSwipePaint(signedDx);" not in archived_visible_branch + assert "_archiveSession(s,true,()=>_waitForSessionMotion(committedSwipeDuration))" in archived_visible_branch assert archive_branch.find("_completeSessionSwipePaint(signedDx);") < archive_branch.find("_archiveSession(s,true,()=>_waitForSessionMotion(committedSwipeReflowDelay))") assert delete_branch.find("deleteSession(s.session_id,async()=>{") < delete_branch.find("_completeSessionSwipePaint(signedDx);") assert "showToast('Imported sessions cannot be deleted here.',3000);" in SESSIONS_JS @@ -129,7 +135,8 @@ def test_session_swipe_paint_uses_transform_only_exit(): assert "requestAnimationFrame(()=>requestAnimationFrame(_clearSessionSwipePaint))" in SESSIONS_JS assert "el.classList.remove('swiping-right','swiping-left','swipe-committed','swipe-removing')" in clear assert ".session-item.swipe-committed,\n .session-item.swipe-removing{transition:" in STYLE_CSS - assert "transform:translateX(calc(-1 * var(--session-swipe-offset,0px))) scale(calc(.82 + var(--session-swipe-progress,0) * .18))" in STYLE_CSS + assert "transition:background .15s,color .15s,transform .5s cubic-bezier(.22,.61,.36,1),box-shadow .15s ease" in STYLE_CSS + assert "transform:translate3d(calc(-1 * var(--session-swipe-offset,0px)),0,0) scale(calc(.82 + var(--session-swipe-progress,0) * .18))" in STYLE_CSS swipe_start = STYLE_CSS.find(".session-item.swipe-removing{") swipe_end = STYLE_CSS.find("}", swipe_start) assert swipe_start >= 0 and swipe_end > swipe_start @@ -137,12 +144,13 @@ def test_session_swipe_paint_uses_transform_only_exit(): assert "height:0" not in swipe_removing assert "padding-top:0" not in swipe_removing assert "margin-bottom:0" not in swipe_removing - assert "transform:translateX(var(--session-swipe-offset,0))" in STYLE_CSS + assert "transform:translate3d(var(--session-swipe-offset,0),var(--session-reflow-offset,0),0)" in STYLE_CSS def test_session_removal_reflows_surviving_rows_smoothly(): assert "let _pendingSessionReflowPositions = null;" in SESSIONS_JS assert "const _optimisticallyRemovedSessionIds = new Set();" in SESSIONS_JS + assert "const _sessionSwipeReturnOffsets = new Map();" in SESSIONS_JS capture = _sessions_block("function _captureSessionReflowPositions(){", "function _waitForSessionMotion") helper = _sessions_block("function _playSessionRowsReflowFromPositions", "function _sessionPrefersReducedMotion") assert "positions.set(row.dataset.sid,row.getBoundingClientRect().top);" in capture @@ -163,6 +171,11 @@ def test_session_removal_reflows_surviving_rows_smoothly(): assert "const serverSessions=_optimisticallyRemovedSessionIds.size" in SESSIONS_JS assert "? (sessData.sessions||[]).filter(s=>s&&!_optimisticallyRemovedSessionIds.has(s.session_id))" in SESSIONS_JS assert ".session-item.session-reflowing{transition:background .15s,color .15s,transform .36s cubic-bezier(.2,.8,.2,1),box-shadow .15s ease;will-change:transform;}" in STYLE_CSS + assert "if(_showArchived&&!_sessionPrefersReducedMotion()) _sessionSwipeReturnOffsets.set(session.session_id,'0px');" in SESSIONS_JS + assert "const swipeReturnOffset=_sessionSwipeReturnOffsets.get(s.session_id);" in SESSIONS_JS + assert "el.classList.add('session-swipe-returning');" in SESSIONS_JS + assert "@keyframes sessionSwipeReturn" in STYLE_CSS + assert ".session-item.session-swipe-returning{animation:sessionSwipeReturn .5s cubic-bezier(.22,.61,.36,1) both;will-change:transform,opacity;}" in STYLE_CSS delete_start = SESSIONS_JS.find("async function deleteSession(sid, beforeDelete=null){") delete_end = SESSIONS_JS.find("// ── Project helpers", delete_start) assert delete_start >= 0 and delete_end > delete_start From 13fa0de8913215f80337e79d5cbaa307efe58d06 Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Thu, 21 May 2026 07:59:16 -0600 Subject: [PATCH 018/349] refined iOS enter animations --- static/sessions.js | 2 +- static/style.css | 5 ++--- tests/test_session_touch_actions.py | 5 ++++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/static/sessions.js b/static/sessions.js index decb50ec0a..fbde5c7bba 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -3735,7 +3735,7 @@ function renderSessionListFromCache(){ const overshoot=Math.max(0,Math.abs(rawOffset)-72); const offset=Math.sign(rawOffset)*(Math.abs(revealedOffset)+Math.sqrt(overshoot)*5); const progress=Math.min(1,Math.abs(revealedOffset)/72); - const reveal=Math.min(132,Math.max(36,Math.abs(rawOffset)+24)); + const reveal=Math.abs(offset); const iconScale=1+Math.min(.45,Math.max(0,Math.abs(rawOffset)-52)/130); el.style.setProperty('--session-swipe-offset',offset+'px'); el.style.setProperty('--session-swipe-reveal',reveal+'px'); diff --git a/static/style.css b/static/style.css index b3a3fd0c6e..1e1536f00c 100644 --- a/static/style.css +++ b/static/style.css @@ -676,12 +676,11 @@ justify-content:center; gap:3px; width:var(--session-swipe-reveal,0px); - min-width:36px; padding:0 8px; box-sizing:border-box; opacity:0; overflow:hidden; - transform:translate3d(calc(-1 * var(--session-swipe-offset,0px)),0,0) scale(calc(.82 + var(--session-swipe-progress,0) * .18)); + transform:translate3d(calc(-1 * var(--session-swipe-offset,0px)),0,0); pointer-events:none; z-index:0; } @@ -712,7 +711,7 @@ align-items:center; justify-content:center; color:#fff; - transform:scaleX(var(--session-swipe-icon-scale,1)); + transform:scale(var(--session-swipe-icon-scale,1)); transform-origin:center; } .session-swipe-badge svg{display:block;stroke-width:2.2;} diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py index 0e9e36e4a9..f42f835316 100644 --- a/tests/test_session_touch_actions.py +++ b/tests/test_session_touch_actions.py @@ -129,6 +129,7 @@ def test_session_swipe_paint_uses_transform_only_exit(): assert "--session-swipe-offset" in paint assert "--session-swipe-reveal" in paint assert "--session-swipe-progress" in paint + assert "const reveal=Math.abs(offset);" in paint assert "window.innerWidth+'px'" in complete assert "el.style.height=rect.height+'px'" in complete assert "requestAnimationFrame(()=>el.classList.add('swipe-removing'))" in complete @@ -136,7 +137,9 @@ def test_session_swipe_paint_uses_transform_only_exit(): assert "el.classList.remove('swiping-right','swiping-left','swipe-committed','swipe-removing')" in clear assert ".session-item.swipe-committed,\n .session-item.swipe-removing{transition:" in STYLE_CSS assert "transition:background .15s,color .15s,transform .5s cubic-bezier(.22,.61,.36,1),box-shadow .15s ease" in STYLE_CSS - assert "transform:translate3d(calc(-1 * var(--session-swipe-offset,0px)),0,0) scale(calc(.82 + var(--session-swipe-progress,0) * .18))" in STYLE_CSS + assert "transform:translate3d(calc(-1 * var(--session-swipe-offset,0px)),0,0)" in STYLE_CSS + assert "transform:scale(var(--session-swipe-icon-scale,1))" in STYLE_CSS + assert "min-width:36px" not in STYLE_CSS[STYLE_CSS.find(".session-swipe-affordance{"):STYLE_CSS.find(".session-swipe-affordance-right{")] swipe_start = STYLE_CSS.find(".session-item.swipe-removing{") swipe_end = STYLE_CSS.find("}", swipe_start) assert swipe_start >= 0 and swipe_end > swipe_start From ad88c92155db5dbdbdd8886206f2a7c160c3bd1a Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Thu, 21 May 2026 08:25:04 -0600 Subject: [PATCH 019/349] clean up & refactor --- static/sessions.js | 55 ++++++++++--------- tests/conftest.py | 9 +++ .../test_issue2454_active_session_spinner.py | 6 +- .../test_issue856_pinned_indicator_layout.py | 2 +- tests/test_session_touch_actions.py | 31 +++-------- 5 files changed, 51 insertions(+), 52 deletions(-) diff --git a/static/sessions.js b/static/sessions.js index fbde5c7bba..27a56b9aa0 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -111,6 +111,10 @@ const SESSION_SWIPE_DURATION_MS = 500; const SESSION_SWIPE_REFLOW_LEAD_MS = 220; const SESSION_REFLOW_TIMEOUT_MS = 420; const SESSION_LIST_FLIP_TIMEOUT_MS = 460; +const SESSION_LONG_PRESS_DELAY_MS = 400; +const SESSION_ARCHIVE_SWIPE_THRESHOLD_PX = 128; +const SESSION_DELETE_SWIPE_THRESHOLD_PX = 128; +const SESSION_SWIPE_CANCEL_RATIO = 0.75; function _formatSessionModelWithGateway(s){ if(!s||!s.model)return''; @@ -1517,7 +1521,25 @@ function _playSessionRowsReflowFromPositions(before, timeoutMs, prefersReducedMo } function _sessionPrefersReducedMotion(){ - return Boolean(window.matchMedia&&window.matchMedia('(prefers-reduced-motion: reduce)').matches); + try{ + return Boolean(window.matchMedia&&window.matchMedia('(prefers-reduced-motion: reduce)').matches); + }catch(_){ + return false; + } +} + +function _makeSessionSwipeAffordance(side, icon, label){ + const affordance=document.createElement('div'); + affordance.className='session-swipe-affordance session-swipe-affordance-'+side; + affordance.setAttribute('aria-hidden','true'); + const badge=document.createElement('span'); + badge.className='session-swipe-badge'; + badge.innerHTML=li(icon,18); + const text=document.createElement('span'); + text.className='session-swipe-label'; + text.textContent=label; + affordance.append(badge,text); + return affordance; } const SESSION_VIRTUAL_ROW_HEIGHT = 52; const SESSION_VIRTUAL_BUFFER_ROWS = 12; @@ -3616,6 +3638,7 @@ function renderSessionListFromCache(){ el.oncontextmenu=(e)=>{ if(readOnly) return; e.preventDefault(); + if(e.pointerType==='touch'||e.pointerType==='pen') return; e.stopPropagation(); clearTimeout(_tapTimer); _tapTimer=null; @@ -3624,22 +3647,9 @@ function renderSessionListFromCache(){ _openSessionActionMenu(s, actions||el); }; - const _makeSessionSwipeAffordance=(side,icon,label)=>{ - const affordance=document.createElement('div'); - affordance.className='session-swipe-affordance session-swipe-affordance-'+side; - affordance.setAttribute('aria-hidden','true'); - const badge=document.createElement('span'); - badge.className='session-swipe-badge'; - badge.innerHTML=li(icon,18); - const text=document.createElement('span'); - text.className='session-swipe-label'; - text.textContent=label; - affordance.append(badge,text); - return affordance; - }; if(!readOnly){ el.append( - _makeSessionSwipeAffordance('right',s.archived?'undo':'archive',s.archived?'Restore':t('session_batch_archive')), + _makeSessionSwipeAffordance('right',s.archived?'undo':'archive',s.archived?t('session_restore'):t('session_batch_archive')), _makeSessionSwipeAffordance('left','trash-2',t('session_batch_delete')), ); } @@ -3663,10 +3673,6 @@ function renderSessionListFromCache(){ let _pointerX=0; let _pointerY=0; let _gesturePointerType=''; - const _longPressDelay=400; - const _archiveSwipeActionThreshold=128; - const _deleteSwipeActionThreshold=128; - const _swipeCancelRatio=0.75; const _clearLongPressTimer=()=>{ if(_longPressTimer){clearTimeout(_longPressTimer);_longPressTimer=null;} if(!_longPressMenuOpened) el.classList.remove('long-pressing'); @@ -3695,7 +3701,7 @@ function renderSessionListFromCache(){ _tapTimer=null; _lastTapTime=0; _openSessionActionMenu(s, el); - },_longPressDelay); + },SESSION_LONG_PRESS_DELAY_MS); }; const _isSessionSwipeTarget=()=>{ return _gesturePointerType!=='mouse'&&!readOnly&&!_renamingSid&&!_sessionSelectMode; @@ -3769,9 +3775,9 @@ function renderSessionListFromCache(){ }; const _handleSessionSwipe=(signedDx,signedDy)=>{ if(_gestureState==='committed'||!_isSessionSwipeTarget()) return false; - const actionThreshold=signedDx>0?_archiveSwipeActionThreshold:_deleteSwipeActionThreshold; + const actionThreshold=signedDx>0?SESSION_ARCHIVE_SWIPE_THRESHOLD_PX:SESSION_DELETE_SWIPE_THRESHOLD_PX; if(Math.abs(signedDx)Math.abs(signedDx)*_swipeCancelRatio) return false; + if(Math.abs(signedDy)>Math.abs(signedDx)*SESSION_SWIPE_CANCEL_RATIO) return false; _gestureState='committed'; _clearLongPressTimer(); clearTimeout(_tapTimer); @@ -3918,11 +3924,6 @@ function renderSessionListFromCache(){ if (_loadingSessionId && _loadingSessionId !== s.session_id) return; startRename(); }; - el.oncontextmenu=(e)=>{ - if(e.pointerType==='touch'||e.pointerType==='pen'){ - e.preventDefault(); - } - }; el.addEventListener('touchstart',(e)=>{ if(_isSessionActionTarget(e.target)) return; const touch=e.changedTouches&&e.changedTouches[0]; diff --git a/tests/conftest.py b/tests/conftest.py index 66cf0102b8..84bc88d14c 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -74,6 +74,15 @@ def _auto_state_dir_name(repo_root) -> str: # tests that read/write config.yaml stay inside the isolated test home. os.environ['HERMES_CONFIG_PATH'] = str(TEST_STATE_DIR / 'config.yaml') + +@pytest.fixture(autouse=True) +def _isolate_hermes_config_path(): + """Keep profile/.env side effects from leaking the live config path across tests.""" + isolated_config_path = str(TEST_STATE_DIR / 'config.yaml') + os.environ['HERMES_CONFIG_PATH'] = isolated_config_path + yield + os.environ['HERMES_CONFIG_PATH'] = isolated_config_path + # ── Server script: always relative to repo root ─────────────────────────── SERVER_SCRIPT = REPO_ROOT / 'server.py' if not SERVER_SCRIPT.exists(): diff --git a/tests/test_issue2454_active_session_spinner.py b/tests/test_issue2454_active_session_spinner.py index 22e7d59d40..21e490c357 100644 --- a/tests/test_issue2454_active_session_spinner.py +++ b/tests/test_issue2454_active_session_spinner.py @@ -55,14 +55,16 @@ def test_active_session_idle_reconcile_clears_stale_busy_and_inflight_state(): def test_session_list_payload_reconciles_active_idle_state_before_optimistic_merge_and_render(): body = _function_body(SESSIONS_SRC, "function _applySessionListPayload(") - reconcile_pos = body.find("_reconcileActiveSessionIdleStateFromList(sessData.sessions||[])") + filter_pos = body.find("const serverSessions=_optimisticallyRemovedSessionIds.size") + reconcile_pos = body.find("_reconcileActiveSessionIdleStateFromList(serverSessions)") merge_pos = body.find("_allSessions = _mergeOptimisticFirstTurnSessions") render_pos = body.find("renderSessionListFromCache()") + assert filter_pos != -1, "payload application must filter optimistic removals before row reconciliation" assert reconcile_pos != -1, "active-session idle reconciliation must run for refreshed rows" assert merge_pos != -1, "session rows must still be applied from /api/sessions" assert render_pos != -1, "payload application must still render from cache" - assert reconcile_pos < merge_pos < render_pos, ( + assert filter_pos < reconcile_pos < merge_pos < render_pos, ( "local S.busy/INFLIGHT state must be reconciled against raw server rows " "before optimistic merging can re-label a stale active session as streaming" ) diff --git a/tests/test_issue856_pinned_indicator_layout.py b/tests/test_issue856_pinned_indicator_layout.py index 09785d40fb..b7c13056da 100644 --- a/tests/test_issue856_pinned_indicator_layout.py +++ b/tests/test_issue856_pinned_indicator_layout.py @@ -120,7 +120,7 @@ def test_plain_mouse_hover_does_not_mark_session_row_dragging(): """Pointermove fires during ordinary hover; drag styling must require an active press.""" assert "let _gestureState='idle';" in SESSIONS_JS assert "_gestureState='pressing';" in SESSIONS_JS - assert "if(_gestureState==='idle') return;" in SESSIONS_JS + assert "if(_gestureState==='idle') return false;" in SESSIONS_JS assert "_gestureState='idle';" in SESSIONS_JS assert ".session-item.dragging:hover" in STYLE_CSS diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py index f42f835316..6f896ef32e 100644 --- a/tests/test_session_touch_actions.py +++ b/tests/test_session_touch_actions.py @@ -24,25 +24,17 @@ def test_session_menu_uses_viewport_height_not_fixed_scroll_cap(): assert "max-height:320px" not in session_menu -def test_session_menu_has_subtle_open_animation(): +def test_session_menu_respects_motion_preferences(): session_menu = STYLE_CSS[STYLE_CSS.find(".session-action-menu{"):STYLE_CSS.find(".session-action-menu.open")] assert "will-change:opacity,transform" in session_menu - assert "transform-origin:top right" in session_menu assert "function _playSessionActionMenuEntrance(menu){" in SESSIONS_JS - assert "typeof menu.animate==='function'" in SESSIONS_JS - assert "{opacity:0, transform:'translate3d(0,-4px,0) scale(.985)'}" in SESSIONS_JS - assert "{duration:450, easing:'cubic-bezier(.2,.8,.2,1)'}" in SESSIONS_JS assert "menu.classList.add('open-animated')" in SESSIONS_JS - assert ".session-action-menu.open-animated{animation:session-menu-in .45s cubic-bezier(.2,.8,.2,1);}" in STYLE_CSS - assert "@keyframes session-menu-in" in STYLE_CSS assert "@media (prefers-reduced-motion:reduce)" in STYLE_CSS assert ".session-action-menu{animation:none;will-change:auto;}" in STYLE_CSS - assert ".session-item,.session-item.dragging,.session-item.session-reflowing,.session-item.swipe-committed,.session-item.swipe-removing{transition:none;}" in STYLE_CSS - assert ".session-item.long-pressing,.session-item.session-swipe-returning{animation:none;}" in STYLE_CSS def test_mobile_session_menu_opens_from_long_press_and_hides_dots(): - assert "_longPressDelay=400" in SESSIONS_JS + assert "const SESSION_LONG_PRESS_DELAY_MS = 400;" in SESSIONS_JS assert "el.classList.add('long-pressing')" in SESSIONS_JS assert "if(!_longPressMenuOpened) el.classList.remove('long-pressing')" in SESSIONS_JS assert "row.classList.remove('menu-open','long-pressing')" in SESSIONS_JS @@ -58,6 +50,10 @@ def test_mobile_session_menu_opens_from_long_press_and_hides_dots(): def test_open_session_menu_consumes_next_row_activation(): + context_menu = _sessions_block("el.oncontextmenu=(e)=>{", "// Use release events") + assert SESSIONS_JS.count("el.oncontextmenu=(e)=>{") == 1 + assert "if(e.pointerType==='touch'||e.pointerType==='pen') return;" in context_menu + assert "_openSessionActionMenu(s, actions||el);" in context_menu assert "if(_sessionActionMenu&&!_sessionActionMenu.contains(target)){" in SESSIONS_JS assert "closeSessionActionMenu();" in SESSIONS_JS assert "e.stopPropagation();" in SESSIONS_JS @@ -84,14 +80,12 @@ def test_open_session_menu_consumes_next_row_activation(): def test_session_swipes_route_archive_restore_and_delete(): assert "_gesturePointerType!=='mouse'" in SESSIONS_JS assert "_swipeTracking=true" in SESSIONS_JS - assert "_archiveSwipeActionThreshold=128" in SESSIONS_JS - assert "_deleteSwipeActionThreshold=128" in SESSIONS_JS + assert "const SESSION_ARCHIVE_SWIPE_THRESHOLD_PX = 128;" in SESSIONS_JS + assert "const SESSION_DELETE_SWIPE_THRESHOLD_PX = 128;" in SESSIONS_JS assert "const SESSION_SWIPE_DURATION_MS = 500;" in SESSIONS_JS assert "const SESSION_SWIPE_REFLOW_LEAD_MS = 220;" in SESSIONS_JS - assert "const committedSwipeDuration=_sessionPrefersReducedMotion()?0:SESSION_SWIPE_DURATION_MS;" in SESSIONS_JS - assert "const committedSwipeReflowDelay=Math.max(0,committedSwipeDuration-SESSION_SWIPE_REFLOW_LEAD_MS);" in SESSIONS_JS swipe_block = _sessions_block("const _handleSessionSwipe=(signedDx,signedDy)=>{", "const _commitSessionSwipe=()=>{") - assert "const actionThreshold=signedDx>0?_archiveSwipeActionThreshold:_deleteSwipeActionThreshold;" in SESSIONS_JS + assert "const actionThreshold=signedDx>0?SESSION_ARCHIVE_SWIPE_THRESHOLD_PX:SESSION_DELETE_SWIPE_THRESHOLD_PX;" in SESSIONS_JS assert "if(Math.abs(signedDx){" in SESSIONS_JS assert "if(_isSessionSwipeTarget()&&(_swipeTracking||dx>dy)) _paintSessionSwipe(signedDx)" in SESSIONS_JS @@ -116,8 +110,6 @@ def test_session_swipes_route_archive_restore_and_delete(): assert delete_branch.find("deleteSession(s.session_id,async()=>{") < delete_branch.find("_completeSessionSwipePaint(signedDx);") assert "showToast('Imported sessions cannot be deleted here.',3000);" in SESSIONS_JS assert "let _gestureState='idle';" in SESSIONS_JS - assert "const _commitSessionSwipe=()=>{" in SESSIONS_JS - assert "if(_gestureState==='committed'){" in SESSIONS_JS assert SESSIONS_JS.count("if(e.pointerType==='touch') return;") >= 3 assert "if(_gesturePointerType==='mouse'&&_gestureState!=='idle') _clearPointerDragState();" in SESSIONS_JS @@ -136,10 +128,8 @@ def test_session_swipe_paint_uses_transform_only_exit(): assert "requestAnimationFrame(()=>requestAnimationFrame(_clearSessionSwipePaint))" in SESSIONS_JS assert "el.classList.remove('swiping-right','swiping-left','swipe-committed','swipe-removing')" in clear assert ".session-item.swipe-committed,\n .session-item.swipe-removing{transition:" in STYLE_CSS - assert "transition:background .15s,color .15s,transform .5s cubic-bezier(.22,.61,.36,1),box-shadow .15s ease" in STYLE_CSS assert "transform:translate3d(calc(-1 * var(--session-swipe-offset,0px)),0,0)" in STYLE_CSS assert "transform:scale(var(--session-swipe-icon-scale,1))" in STYLE_CSS - assert "min-width:36px" not in STYLE_CSS[STYLE_CSS.find(".session-swipe-affordance{"):STYLE_CSS.find(".session-swipe-affordance-right{")] swipe_start = STYLE_CSS.find(".session-item.swipe-removing{") swipe_end = STYLE_CSS.find("}", swipe_start) assert swipe_start >= 0 and swipe_end > swipe_start @@ -160,7 +150,6 @@ def test_session_removal_reflows_surviving_rows_smoothly(): assert "const delta=oldTop-row.getBoundingClientRect().top;" in helper assert "const movingRows=[];" in helper assert "list.getBoundingClientRect();" in helper - assert helper.count("getBoundingClientRect()") == 2 assert "row.style.transition='none';" in helper assert "row.classList.add('session-reflowing')" in helper assert "requestAnimationFrame(()=>requestAnimationFrame(()=>{" in helper @@ -177,8 +166,6 @@ def test_session_removal_reflows_surviving_rows_smoothly(): assert "if(_showArchived&&!_sessionPrefersReducedMotion()) _sessionSwipeReturnOffsets.set(session.session_id,'0px');" in SESSIONS_JS assert "const swipeReturnOffset=_sessionSwipeReturnOffsets.get(s.session_id);" in SESSIONS_JS assert "el.classList.add('session-swipe-returning');" in SESSIONS_JS - assert "@keyframes sessionSwipeReturn" in STYLE_CSS - assert ".session-item.session-swipe-returning{animation:sessionSwipeReturn .5s cubic-bezier(.22,.61,.36,1) both;will-change:transform,opacity;}" in STYLE_CSS delete_start = SESSIONS_JS.find("async function deleteSession(sid, beforeDelete=null){") delete_end = SESSIONS_JS.find("// ── Project helpers", delete_start) assert delete_start >= 0 and delete_end > delete_start From 59ffe4fca5c3eb21e9df90ab24f0de4d8cd18c76 Mon Sep 17 00:00:00 2001 From: fxd-jason Date: Thu, 21 May 2026 21:11:56 +0800 Subject: [PATCH 020/349] fix: geist-contrast skin composer UI improvements - Light mode: override white user-bubble-text so textarea text is black (#111) - Remove scrollbar from textarea (scrollbar-width:none + webkit) - Remove double border on focus: split composer-box:focus-within from textarea:focus to prevent stacking box-shadows - Remove composer-box border (border:none) to eliminate double-border ring --- static/style.css | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/static/style.css b/static/style.css index 9ddc7cc02b..d7c62b643b 100644 --- a/static/style.css +++ b/static/style.css @@ -347,7 +347,7 @@ :root[data-skin="geist-contrast"] .tool-card, :root[data-skin="geist-contrast"] .msg-body pre, :root[data-skin="geist-contrast"] .preview-md pre, - :root[data-skin="geist-contrast"] .composer-box{background:var(--surface)!important;border-color:var(--border)!important;box-shadow:none!important;} + :root[data-skin="geist-contrast"] .composer-box{background:var(--surface)!important;border:none!important;box-shadow:none!important;} :root[data-skin="geist-contrast"] .session-item, :root[data-skin="geist-contrast"] .nav-tab, :root[data-skin="geist-contrast"] .rail-btn, @@ -440,10 +440,10 @@ :root[data-skin="geist-contrast"] button.send-btn:disabled{background:var(--surface-subtle)!important;border-color:var(--border)!important;color:var(--muted)!important;opacity:1!important;} :root.dark[data-skin="geist-contrast"] button.send-btn:disabled svg, :root.dark[data-skin="geist-contrast"] button.send-btn:disabled [data-lucide]{color:var(--muted)!important;stroke:var(--muted)!important;} + :root[data-skin="geist-contrast"] .composer-box:focus-within{border-color:transparent!important;box-shadow:0 0 0 3px var(--focus-ring)!important;outline:none!important;} :root[data-skin="geist-contrast"] input:focus, :root[data-skin="geist-contrast"] textarea:focus, - :root[data-skin="geist-contrast"] select:focus, - :root[data-skin="geist-contrast"] .composer-box:focus-within, + :root[data-skin="geist-contrast"] select:focus{border-color:var(--accent)!important;box-shadow:none!important;outline:none!important;} :root[data-skin="geist-contrast"] .app-dialog-input:focus, :root[data-skin="geist-contrast"] .sidebar-search input:focus{border-color:var(--accent)!important;box-shadow:0 0 0 3px var(--focus-ring)!important;outline:none!important;} :root[data-skin="geist-contrast"] .logo, @@ -463,6 +463,12 @@ :root[data-skin="geist-contrast"] .sidebar-date-header.pinned{color:var(--accent-text)!important;} :root[data-skin="geist-contrast"]::-webkit-scrollbar-thumb{background:var(--border2)!important;} :root[data-skin="geist-contrast"] ::selection{background:var(--accent-bg-strong);color:var(--strong);} + /* ── Geist Contrast: composer fixes ── */ + /* Light mode: override white user-bubble-text so textarea text is black */ + :root[data-skin="geist-contrast"]:not(.dark){--user-bubble-text:#111111;} + /* Remove scrollbar from textarea */ + :root[data-skin="geist-contrast"] textarea#msg{scrollbar-width:none;overflow-y:auto;} + :root[data-skin="geist-contrast"] textarea#msg::-webkit-scrollbar{display:none;} /* #594: app-dialog light mode overrides — base styles use hardcoded dark gradients */ :root:not(.dark) .app-dialog{ From e2bff58964730e687f62c85d28547c34705ae9b4 Mon Sep 17 00:00:00 2001 From: dobby-d-elf Date: Sun, 24 May 2026 17:58:26 -0600 Subject: [PATCH 021/349] Refine iOS-style session swipe actions --- static/sessions.js | 14 +++++++---- static/style.css | 22 ++++++++++------- tests/test_session_touch_actions.py | 37 +++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 13 deletions(-) diff --git a/static/sessions.js b/static/sessions.js index 9ecaa6f590..223dd981e6 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -1908,12 +1908,15 @@ async function _archiveSession(session, archived=true, beforeListRender=null){ try{ const response=await api('/api/session/archive',{method:'POST',body:JSON.stringify({session_id:session.session_id,archived})}); session.archived=archived; + const cached=(_allSessions||[]).find(s=>s&&s.session_id===session.session_id); + if(cached) cached.archived=archived; if(S.session&&S.session.session_id===session.session_id) S.session.archived=archived; + showToast(session.archived?_sessionArchiveToast(response,session):t('session_restored')); if(renderHold) await renderHold; if(_showArchived&&!_sessionPrefersReducedMotion()) _sessionSwipeReturnOffsets.set(session.session_id,'0px'); _pendingSessionReflowPositions=reflowPositions; - await renderSessionList(); - showToast(session.archived?_sessionArchiveToast(response,session):t('session_restored')); + renderSessionListFromCache(); + void renderSessionList(); return true; }catch(err){if(renderHold) await renderHold.catch(()=>{});_pendingSessionReflowPositions=null;showToast(t('session_archive_failed')+err.message);return false;} } @@ -3767,7 +3770,7 @@ function renderSessionListFromCache(){ if(!readOnly){ el.append( - _makeSessionSwipeAffordance('right',s.archived?'undo':'archive',s.archived?t('session_restore'):t('session_batch_archive')), + _makeSessionSwipeAffordance('right',s.archived?'undo':'archive',s.archived?'Restore':t('session_batch_archive')), _makeSessionSwipeAffordance('left','trash-2',t('session_batch_delete')), ); } @@ -3860,10 +3863,12 @@ function renderSessionListFromCache(){ const offset=Math.sign(rawOffset)*(Math.abs(revealedOffset)+Math.sqrt(overshoot)*5); const progress=Math.min(1,Math.abs(revealedOffset)/72); const reveal=Math.abs(offset); - const iconScale=1+Math.min(.45,Math.max(0,Math.abs(rawOffset)-52)/130); + const iconScale=Math.min(1,Math.max(.01,progress*1.12)); + const badgeStretch=Math.min(Math.max(0,reveal-34),overshoot*1.15); el.style.setProperty('--session-swipe-offset',offset+'px'); el.style.setProperty('--session-swipe-reveal',reveal+'px'); el.style.setProperty('--session-swipe-icon-scale',iconScale); + el.style.setProperty('--session-swipe-badge-stretch',badgeStretch+'px'); el.style.setProperty('--session-swipe-progress',Math.pow(progress,1.5)); el.classList.toggle('swiping-right',offset>0); el.classList.toggle('swiping-left',offset<0); @@ -3872,6 +3877,7 @@ function renderSessionListFromCache(){ el.style.removeProperty('--session-swipe-offset'); el.style.removeProperty('--session-swipe-reveal'); el.style.removeProperty('--session-swipe-icon-scale'); + el.style.removeProperty('--session-swipe-badge-stretch'); el.style.removeProperty('--session-swipe-progress'); el.style.removeProperty('height'); el.style.removeProperty('min-height'); diff --git a/static/style.css b/static/style.css index ab23024912..51a95324c2 100644 --- a/static/style.css +++ b/static/style.css @@ -735,7 +735,7 @@ justify-content:center; gap:3px; width:var(--session-swipe-reveal,0px); - padding:0 8px; + padding:0; box-sizing:border-box; opacity:0; overflow:hidden; @@ -746,16 +746,18 @@ .session-swipe-affordance-right{ left:0; color:#fff; - background:var(--warning); - border-radius:8px 6px 6px 8px; + background:transparent; + border-radius:0; transform-origin:left center; + --session-swipe-action-color:var(--warning); } .session-swipe-affordance-left{ right:0; color:#fff; - background:var(--error); - border-radius:6px 8px 8px 6px; + background:transparent; + border-radius:0; transform-origin:right center; + --session-swipe-action-color:var(--error); } .session-item.swiping-right .session-swipe-affordance-right, .session-item.swiping-left .session-swipe-affordance-left{ @@ -763,13 +765,15 @@ } .session-text,.session-state-indicator,.session-actions{z-index:1;} .session-swipe-badge{ - width:28px; - height:28px; - border-radius:0; + width:calc(34px + var(--session-swipe-badge-stretch,0px)); + height:34px; + border-radius:999px; + background:var(--session-swipe-action-color); display:flex; align-items:center; justify-content:center; color:#fff; + flex:0 0 auto; transform:scale(var(--session-swipe-icon-scale,1)); transform-origin:center; } @@ -804,7 +808,7 @@ .session-item.active{background:var(--accent-bg);color:var(--accent);} .session-item.active.swiping-right{background:color-mix(in srgb,var(--warning) 20%,var(--accent-bg));} .session-item.active.swiping-left{background:color-mix(in srgb,var(--error) 18%,var(--accent-bg));} - .session-item.archived .session-swipe-affordance-right{background:var(--success);} + .session-item.archived .session-swipe-affordance-right{--session-swipe-action-color:var(--success);} .session-item.archived.swiping-right, .session-item.archived.dragging.swiping-right{background:color-mix(in srgb,var(--success) 16%,var(--surface));box-shadow:0 0 0 1px color-mix(in srgb,var(--success) 48%,transparent);} .session-item.active.archived.swiping-right{background:color-mix(in srgb,var(--success) 20%,var(--accent-bg));} diff --git a/tests/test_session_touch_actions.py b/tests/test_session_touch_actions.py index 6f896ef32e..8d6fada33b 100644 --- a/tests/test_session_touch_actions.py +++ b/tests/test_session_touch_actions.py @@ -121,12 +121,16 @@ def test_session_swipe_paint_uses_transform_only_exit(): assert "--session-swipe-offset" in paint assert "--session-swipe-reveal" in paint assert "--session-swipe-progress" in paint + assert "--session-swipe-badge-stretch" in paint assert "const reveal=Math.abs(offset);" in paint + assert "const iconScale=Math.min(1,Math.max(.01,progress*1.12));" in paint + assert "const badgeStretch=Math.min(Math.max(0,reveal-34),overshoot*1.15);" in paint assert "window.innerWidth+'px'" in complete assert "el.style.height=rect.height+'px'" in complete assert "requestAnimationFrame(()=>el.classList.add('swipe-removing'))" in complete assert "requestAnimationFrame(()=>requestAnimationFrame(_clearSessionSwipePaint))" in SESSIONS_JS assert "el.classList.remove('swiping-right','swiping-left','swipe-committed','swipe-removing')" in clear + assert "el.style.removeProperty('--session-swipe-badge-stretch');" in clear assert ".session-item.swipe-committed,\n .session-item.swipe-removing{transition:" in STYLE_CSS assert "transform:translate3d(calc(-1 * var(--session-swipe-offset,0px)),0,0)" in STYLE_CSS assert "transform:scale(var(--session-swipe-icon-scale,1))" in STYLE_CSS @@ -140,6 +144,29 @@ def test_session_swipe_paint_uses_transform_only_exit(): assert "transform:translate3d(var(--session-swipe-offset,0),var(--session-reflow-offset,0),0)" in STYLE_CSS +def test_session_swipe_actions_use_circular_icon_badges(): + right_start = STYLE_CSS.find(".session-swipe-affordance-right{") + left_start = STYLE_CSS.find(".session-swipe-affordance-left{") + badge_start = STYLE_CSS.find(".session-swipe-badge{") + right = STYLE_CSS[right_start:left_start] + left = STYLE_CSS[left_start:STYLE_CSS.find(".session-item.swiping-right", left_start)] + badge = STYLE_CSS[badge_start:STYLE_CSS.find(".session-swipe-badge svg", badge_start)] + assert "background:transparent" in right + assert "background:transparent" in left + assert "--session-swipe-action-color:var(--warning)" in right + assert "--session-swipe-action-color:var(--error)" in left + assert "width:calc(34px + var(--session-swipe-badge-stretch,0px))" in badge + assert "height:34px" in badge + assert "border-radius:999px" in badge + assert "background:var(--session-swipe-action-color)" in badge + assert ".session-item.archived .session-swipe-affordance-right{--session-swipe-action-color:var(--success);}" in STYLE_CSS + assert "_makeSessionSwipeAffordance('right',s.archived?'undo':'archive',s.archived?'Restore':t('session_batch_archive'))" in SESSIONS_JS + label = STYLE_CSS[STYLE_CSS.find(".session-swipe-label{"):STYLE_CSS.find(".session-item.dragging")] + assert "session-swipe-label" in SESSIONS_JS + assert "max-width:58px" in label + assert "font-size:10px" in label + + def test_session_removal_reflows_surviving_rows_smoothly(): assert "let _pendingSessionReflowPositions = null;" in SESSIONS_JS assert "const _optimisticallyRemovedSessionIds = new Set();" in SESSIONS_JS @@ -159,6 +186,16 @@ def test_session_removal_reflows_surviving_rows_smoothly(): assert "_playSessionRowsReflowFromPositions(reflowBefore,reflowTimeout,_sessionPrefersReducedMotion);" in SESSIONS_JS assert "async function _archiveSession(session, archived=true, beforeListRender=null){" in SESSIONS_JS assert "const renderHold=beforeListRender?Promise.resolve().then(beforeListRender):null;" in SESSIONS_JS + assert "const cached=(_allSessions||[]).find(s=>s&&s.session_id===session.session_id);" in SESSIONS_JS + assert "if(cached) cached.archived=archived;" in SESSIONS_JS + archive_start = SESSIONS_JS.find("async function _archiveSession(session, archived=true, beforeListRender=null){") + archive_end = SESSIONS_JS.find("function _openSessionActionMenu", archive_start) + archive_body = SESSIONS_JS[archive_start:archive_end] + toast_idx = archive_body.find("showToast(session.archived?_sessionArchiveToast(response,session):t('session_restored'));") + hold_idx = archive_body.find("if(renderHold) await renderHold;") + cache_render_idx = archive_body.find("renderSessionListFromCache();") + reconcile_idx = archive_body.find("void renderSessionList();") + assert 0 <= toast_idx < hold_idx < cache_render_idx < reconcile_idx assert "if(renderHold) await renderHold;" in SESSIONS_JS assert "const serverSessions=_optimisticallyRemovedSessionIds.size" in SESSIONS_JS assert "? (sessData.sessions||[]).filter(s=>s&&!_optimisticallyRemovedSessionIds.has(s.session_id))" in SESSIONS_JS From fa57868431b8dc6231ca7e962653356046c70401 Mon Sep 17 00:00:00 2001 From: AJV20 <24819659+AJV20@users.noreply.github.com> Date: Sun, 24 May 2026 20:05:20 -0400 Subject: [PATCH 022/349] feat(chat): add WebUI prefill script hook --- ARCHITECTURE.md | 3 + CHANGELOG.md | 4 ++ README.md | 32 +++++++++ api/streaming.py | 106 ++++++++++++++++++++++++---- tests/test_webui_prefill_context.py | 66 ++++++++++++++++- 5 files changed, 196 insertions(+), 15 deletions(-) diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 6b865018d7..c9834c3664 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -122,6 +122,9 @@ Environment variables controlling behavior: HERMES_WEBUI_DEFAULT_MODEL Optional model override; unset means provider default HERMES_WEBUI_PASSWORD Optional: enable password auth (off by default) HERMES_WEBUI_SKIP_ONBOARDING Optional: bypass the first-run onboarding wizard + HERMES_PREFILL_MESSAGES_FILE Optional JSON message list for browser-turn prefill context + HERMES_WEBUI_PREFILL_MESSAGES_SCRIPT Optional command that prints JSON messages or text prefill context + HERMES_WEBUI_PREFILL_MESSAGES_SCRIPT_TIMEOUT Optional script timeout in seconds (default 5, max 30) HERMES_HOME Base directory for Hermes state (~/.hermes by default) Test isolation environment variables (set by conftest.py): diff --git a/CHANGELOG.md b/CHANGELOG.md index a1f805e72b..bbc2614a21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ ## [Unreleased] +### Added + +- WebUI can now opt into a `webui_prefill_messages_script` / `HERMES_WEBUI_PREFILL_MESSAGES_SCRIPT` hook for dynamic browser-turn prefill context from local notes or recall systems. The script output is normalized to ephemeral prefill messages and browser status still hides message bodies while redacting script errors. + ## [v0.51.131] — 2026-05-24 — Release DC (stage-batch13 — 6-PR notes-drawer + context-parity + PWA-swipe + locale polish) ### Added diff --git a/README.md b/README.md index ccaca24114..489f7b71ae 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,38 @@ For self-hosted VM or homelab installs, `ctl.sh` wraps the common daemon lifecyc `ctl.sh start` runs the bootstrap in foreground/no-browser mode behind the daemon wrapper, writes logs to `~/.hermes/webui.log`, and respects `.env` plus inline overrides such as `HERMES_WEBUI_HOST=0.0.0.0 ./ctl.sh start`. +### Optional session recall prefill + +WebUI can attach ephemeral prefill messages to new browser-originated +agent turns. This is useful when a deployment already has a local recall script +for Joplin, Obsidian, Notion, llm-wiki, or another third-party notes source and +wants the browser chat to receive the same high-level context as other Hermes +surfaces. + +Static JSON remains supported through `prefill_messages_file` or +`HERMES_PREFILL_MESSAGES_FILE`. For dynamic recall, opt in explicitly with a +WebUI-specific script hook: + +```yaml +webui_prefill_messages_script: + - python3 + - /path/to/notes_recall.py +webui_prefill_messages_script_timeout: 5 +``` + +or: + +```bash +HERMES_WEBUI_PREFILL_MESSAGES_SCRIPT="python3 /path/to/notes_recall.py" \ +HERMES_WEBUI_PREFILL_MESSAGES_SCRIPT_TIMEOUT=5 \ +./ctl.sh restart +``` + +The script may print either an OpenAI-style JSON message list, a JSON object with +a `messages` list, or plain text; plain text is wrapped as one `system` prefill +message. The browser only receives a compact status event (`source`, `label`, +message count, and redacted errors), never the prefill message bodies. + The bootstrap will: 1. Detect Hermes Agent and, if missing, attempt the official installer (`curl -fsSL https://raw.githubusercontent.com/NousResearch/hermes-agent/main/scripts/install.sh | bash`). diff --git a/api/streaming.py b/api/streaming.py index d319d9d7d7..6a46311ed1 100644 --- a/api/streaming.py +++ b/api/streaming.py @@ -10,7 +10,9 @@ import os import queue import re +import shlex import sys +import subprocess import threading import time import traceback @@ -285,29 +287,105 @@ def _resolve_prefill_path(raw: str) -> Path: return path +def _prefill_not_configured() -> dict: + return {"status": "not_configured", "source": "none", "label": "", "messages": [], "message_count": 0} + + +def _load_prefill_messages_file(file_raw: str, *, source: str = "file", status: str = "loaded") -> dict: + path = _resolve_prefill_path(file_raw) + label = path.name or "prefill file" + if not path.exists(): + return {"status": "error", "source": source, "label": label, "messages": [], "message_count": 0, "error": "prefill file not found"} + try: + messages = _valid_prefill_messages(json.loads(path.read_text(encoding="utf-8"))) + return {"status": status, "source": source, "label": label, "messages": messages, "message_count": len(messages)} + except Exception as exc: + return {"status": "error", "source": source, "label": label, "messages": [], "message_count": 0, "error": _redact_prefill_status_text(str(exc))} + + +def _prefill_script_timeout(config_data: dict) -> float: + raw = os.getenv("HERMES_WEBUI_PREFILL_MESSAGES_SCRIPT_TIMEOUT", "") or str(config_data.get("webui_prefill_messages_script_timeout") or "") + try: + return max(0.1, min(float(raw or 5), 30.0)) + except Exception: + return 5.0 + + +def _prefill_script_command(raw) -> list[str]: + if isinstance(raw, (list, tuple)): + return [str(part) for part in raw if str(part)] + parts = shlex.split(str(raw or "")) + if not parts: + return [] + # A single script path mirrors prefill_messages_file path resolution. More + # complex commands keep their argv untouched so admins can pass arguments. + if len(parts) == 1: + parts[0] = str(_resolve_prefill_path(parts[0])) + return parts + + +def _messages_from_prefill_script_output(text: str) -> list[dict]: + stripped = str(text or "").strip() + if not stripped: + return [] + try: + payload = json.loads(stripped) + except Exception: + payload = None + if isinstance(payload, dict): + payload = payload.get("messages") + messages = _valid_prefill_messages(payload) + if messages: + return messages + return [{"role": "system", "content": stripped}] + + +def _load_prefill_messages_script(config_data: dict) -> dict: + script_raw = os.getenv("HERMES_WEBUI_PREFILL_MESSAGES_SCRIPT", "") or config_data.get("webui_prefill_messages_script") + if not script_raw: + return _prefill_not_configured() + command = _prefill_script_command(script_raw) + label = Path(command[0]).name if command else "prefill script" + if not command: + return {"status": "error", "source": "script", "label": label, "messages": [], "message_count": 0, "error": "prefill script is empty"} + try: + proc = subprocess.run( + command, + text=True, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + timeout=_prefill_script_timeout(config_data), + check=False, + ) + except subprocess.TimeoutExpired: + return {"status": "error", "source": "script", "label": label, "messages": [], "message_count": 0, "error": "prefill script timed out"} + except Exception as exc: + return {"status": "error", "source": "script", "label": label, "messages": [], "message_count": 0, "error": _redact_prefill_status_text(str(exc))} + if proc.returncode != 0: + err = _redact_prefill_status_text(proc.stderr or proc.stdout or f"prefill script exited {proc.returncode}") + return {"status": "error", "source": "script", "label": label, "messages": [], "message_count": 0, "error": err} + messages = _messages_from_prefill_script_output(proc.stdout) + return {"status": "loaded", "source": "script", "label": label, "messages": messages, "message_count": len(messages)} + + def _load_webui_prefill_context( config_data: Optional[dict] = None, ) -> dict: """Load configured WebUI session prefill messages. - Supports the same bounded JSON-file shape used by Hermes Agent. WebUI does - not execute a configured prefill script here; session recall that requires - code execution should go through the normal MCP/tool path instead of an - always-on per-turn subprocess before SSE starts. + Supports the same bounded JSON-file shape used by Hermes Agent. WebUI also + supports its own explicitly opt-in script hook so admins can bridge Joplin, + Obsidian, Notion, llm-wiki, or another local notes source into ephemeral + turn context without baking any one note provider into the WebUI. """ cfg = config_data if isinstance(config_data, dict) else get_config() + script_context = _load_prefill_messages_script(cfg) + if script_context.get("status") != "not_configured": + return script_context file_raw = os.getenv("HERMES_PREFILL_MESSAGES_FILE", "") or str(cfg.get("prefill_messages_file") or "") if file_raw: - path = _resolve_prefill_path(file_raw) - label = path.name or "prefill file" - if not path.exists(): - return {"status": "error", "source": "file", "label": label, "messages": [], "message_count": 0, "error": "prefill file not found"} - try: - messages = _valid_prefill_messages(json.loads(path.read_text(encoding="utf-8"))) - return {"status": "loaded", "source": "file", "label": label, "messages": messages, "message_count": len(messages)} - except Exception as exc: - return {"status": "error", "source": "file", "label": label, "messages": [], "message_count": 0, "error": _redact_prefill_status_text(str(exc))} - return {"status": "not_configured", "source": "none", "label": "", "messages": [], "message_count": 0} + return _load_prefill_messages_file(file_raw) + return _prefill_not_configured() def _public_prefill_context_status(prefill_context: dict) -> dict: diff --git a/tests/test_webui_prefill_context.py b/tests/test_webui_prefill_context.py index 06a18e0ceb..3584aba281 100644 --- a/tests/test_webui_prefill_context.py +++ b/tests/test_webui_prefill_context.py @@ -2,6 +2,8 @@ from __future__ import annotations import json +import sys +from pathlib import Path def test_prefill_json_file_keeps_valid_roles_and_drops_invalid_items(tmp_path): @@ -32,7 +34,7 @@ def test_prefill_json_file_keeps_valid_roles_and_drops_invalid_items(tmp_path): ] -def test_prefill_script_config_is_ignored_in_webui(tmp_path): +def test_prefill_script_config_is_not_used_without_webui_opt_in(tmp_path): from api.streaming import _load_webui_prefill_context script = tmp_path / "recall.py" @@ -49,6 +51,68 @@ def test_prefill_script_config_is_ignored_in_webui(tmp_path): } +def test_webui_prefill_script_loads_json_messages(tmp_path): + from api.streaming import _load_webui_prefill_context + + script = tmp_path / "recall.py" + script.write_text( + "import json\n" + "print(json.dumps([{'role': 'system', 'content': 'Joplin recall'}, {'role': 'tool', 'content': 'drop me'}]))\n", + encoding="utf-8", + ) + + result = _load_webui_prefill_context({"webui_prefill_messages_script": [sys.executable, str(script)]}) + + assert result["status"] == "loaded" + assert result["source"] == "script" + assert result["label"] == Path(sys.executable).name + assert result["messages"] == [{"role": "system", "content": "Joplin recall"}] + + +def test_webui_prefill_script_wraps_plain_text_for_any_notes_source(tmp_path): + from api.streaming import _load_webui_prefill_context + + script = tmp_path / "obsidian_recall.py" + script.write_text("print('Obsidian project note context')\n", encoding="utf-8") + + result = _load_webui_prefill_context({"webui_prefill_messages_script": [sys.executable, str(script)]}) + + assert result["status"] == "loaded" + assert result["source"] == "script" + assert result["messages"] == [{"role": "system", "content": "Obsidian project note context"}] + + +def test_webui_prefill_script_errors_are_redacted(tmp_path): + from api.streaming import _load_webui_prefill_context + + script = tmp_path / "bad_recall.py" + script.write_text("import sys; print('token=redaction-test-placeholder', file=sys.stderr); raise SystemExit(2)\n", encoding="utf-8") + + result = _load_webui_prefill_context({"webui_prefill_messages_script": [sys.executable, str(script)]}) + + assert result["status"] == "error" + assert result["source"] == "script" + assert "redaction-test-placeholder" not in result["error"] + assert "[REDACTED]" in result["error"] + + +def test_webui_prefill_script_takes_precedence_over_static_file(tmp_path): + from api.streaming import _load_webui_prefill_context + + prefill = tmp_path / "prefill.json" + prefill.write_text(json.dumps([{"role": "system", "content": "static"}]), encoding="utf-8") + script = tmp_path / "recall.py" + script.write_text("print('dynamic')\n", encoding="utf-8") + + result = _load_webui_prefill_context({ + "prefill_messages_file": str(prefill), + "webui_prefill_messages_script": [sys.executable, str(script)], + }) + + assert result["source"] == "script" + assert result["messages"] == [{"role": "system", "content": "dynamic"}] + + def test_public_prefill_status_strips_message_bodies(): from api.streaming import _public_prefill_context_status From efe3d7c296f6e769a43bd1781a5ecdfba6d4b64b Mon Sep 17 00:00:00 2001 From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com> Date: Fri, 22 May 2026 10:41:10 +0200 Subject: [PATCH 023/349] fix(chat): avoid false restart wording for interrupted responses (cherry picked from commit ef8fd879682aeb729a7b7afa1e7c46478ca5ebb6) --- CHANGELOG.md | 8 +++--- api/models.py | 8 +++--- api/run_journal.py | 2 +- api/streaming.py | 2 +- docs/troubleshooting.md | 4 +-- tests/test_run_journal.py | 4 +++ .../test_session_lost_response_regression.py | 25 +++++++++++++++++-- tests/test_session_sidecar_repair.py | 6 +++-- 8 files changed, 44 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1f805e72b..64fa994fe4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ ## [Unreleased] +### Fixed + +- Clarify `Response interrupted` recovery markers so they report that the live response stream stopped instead of asserting that the WebUI process restarted. The same stale-recovery path also covers browser/SSE disconnects and lost worker bookkeeping, so the marker now matches systemd evidence instead of implying a restart that did not happen. + ## [v0.51.131] — 2026-05-24 — Release DC (stage-batch13 — 6-PR notes-drawer + context-parity + PWA-swipe + locale polish) ### Added @@ -33,8 +37,6 @@ - **Opus Advisor verdict: SHIP-AS-IS.** Zero MUST-FIX. Three SHOULD-FIX items filed as follow-up issues (incomplete locale coverage for notes-drawer i18n keys, `_joplin_api_get` URL-token defense-in-depth, prefill `setattr` cache-reuse safety net). - **#2527 i18n coverage**: 10 of the 11 non-en locales currently ship the English string `'Third-party notes'` for the drawer header. Since the drawer is default-off, user impact is zero today; follow-up issue tracks proper translations before any default-on transition. - - ## [v0.51.130] — 2026-05-24 — Release DB (stage-batch12 — 3-PR profile-isolation + boot-precedence + workspace Artifacts tab) ### Fixed @@ -143,6 +145,7 @@ - UX evidence for #2812 captured at 1280/1440/1920/mobile (iPhone 14 emulation); Telegram-approved. - File a follow-up issue for pdeathsig-on-supervisor-thread hardening (#2854 deferred Option B) and French-locale `open_in_vscode` parity gap (predates this batch, Opus advisor flagged). + ## [v0.51.126] — 2026-05-24 — Release CX (stage-batch8 — 2-PR low-risk batch — kanban markdown + live activity timeline) ### Added @@ -326,7 +329,6 @@ - **PR #2738** by @weidzhou — `_write_session_index()` full-rebuild path now deduplicates entries by `session_id`. When old-format `session_*.json` files coexist with WebUI-format `xxx.json` files sharing the same `session_id`, the index produced duplicate Vue `:key` entries and crashed the frontend with a blank page. The lazy rebuild now uses `dict[session_id → compact_entry]` keyed on session_id, with the higher `message_count` entry winning on conflict. - **PR #2730** by @ashbuildslife — Sanitize git fetch diagnostics before returning update-check errors to the browser. New `_sanitize_git_diagnostic()` in `api/updates.py` strips credentialed URL userinfo (`user:token@host`), GitHub token shapes (`ghp_*`, `gho_*`, `github_pat_*`), and secret-looking query parameters (`?access_token=`, `?token=`, `?password=`, `?auth=`, `?key=`), then caps the message at 300 characters. Empirically verified that plain `https://github.com/owner/repo.git` URLs and SSH-style `git@host:owner/repo` remotes pass through untouched — only credentialed shapes are redacted. Update-check failure context (e.g. `Authentication failed`, network errors) is preserved. - **PR #2742** by @Isla-Liu — Per-turn SQLite connection leak in handoff-summary path (#2233). Two functions on the `/api/session/handoff-summary` hot path were opening `sqlite3.connect(...)` inside a bare `with` statement, which commits the transaction at scope exit but does NOT close the connection. Per-turn invocations accumulated `state.db`/`state.db-wal` file descriptors and CPython heap pages on long-lived worker threads, surfacing as multi-GB VmRSS / 6× duplicated state.db fds on long-running installs. Wrapped both call sites with `contextlib.closing(...)` (already imported and used at 7 other sites in the same files) so the connection is closed deterministically: `api/models.py::count_conversation_rounds` and `api/routes.py::_persist_handoff_summary_to_state_db`. Regression test loops both functions 20× against a tmp `state.db` and asserts `/proc//fd` count does not grow more than 2. Live soak: fd growth = 0, VmRSS growth = 0 KB across 20 POSTs. - ## [v0.51.107] — 2026-05-21 — Release CE (stage-400 — 8-PR batch — pinned-sessions-limit getter rename + uploaded-file user-turn dedupe + active-run repair guard + incremental KaTeX streaming + profile default model on fresh boot + French locale completion + update-check error surfacing + release-update apply path) ### Fixed diff --git a/api/models.py b/api/models.py index 0a734bc5fe..1317427bae 100644 --- a/api/models.py +++ b/api/models.py @@ -764,18 +764,18 @@ def _get_profile_home(profile) -> Path: _INTERRUPTED_RECOVERED_WORDING = ( '**Response interrupted.**\n\n' - 'The WebUI process restarted before this turn finished. ' + 'The live response stream stopped before this turn finished. ' 'The partial output above was recovered from the run journal, ' 'but the interrupted agent process could not continue.' ) _INTERRUPTED_NO_OUTPUT_WORDING = ( '**Response interrupted.**\n\n' - 'The WebUI process restarted before this turn finished. ' + 'The live response stream stopped before this turn finished. ' 'The user message above was preserved, but no agent output was recovered.' ) _INTERRUPTED_PENDING_RETRY_WORDING = ( '**Response interrupted.**\n\n' - 'The WebUI process restarted before this turn finished. ' + 'The live response stream stopped before this turn finished. ' 'Recovering the partial output from the run journal — ' 'reload this session to retry.' ) @@ -783,7 +783,7 @@ def _get_profile_home(profile) -> Path: # or the marker has been pending longer than _JOURNAL_RETRY_GIVEUP_SECONDS). _INTERRUPTED_NEUTRAL_WORDING = ( '**Response interrupted.**\n\n' - 'The WebUI process restarted before this turn finished. ' + 'The live response stream stopped before this turn finished. ' 'Partial output may have been lost.' ) diff --git a/api/run_journal.py b/api/run_journal.py index 0a0f42ff10..92b42e50cf 100644 --- a/api/run_journal.py +++ b/api/run_journal.py @@ -262,7 +262,7 @@ def stale_interrupted_event(session_id: str, run_id: str, *, after_seq: int | No return None payload = { "type": "interrupted", - "message": "WebUI restarted or lost the live worker before this run finished.", + "message": "The live worker stopped before this run finished.", "hint": "The transcript was restored to the last journaled event. Start a new turn if you still need the task to continue.", "session_id": session_id, "stream_id": run_id, diff --git a/api/streaming.py b/api/streaming.py index d319d9d7d7..db6488030f 100644 --- a/api/streaming.py +++ b/api/streaming.py @@ -2613,7 +2613,7 @@ def _stream_writeback_can_supersede_recovery_marker(session, msg_text): if last.get('type') != 'interrupted': return False content = str(last.get('content') or '') - if 'Response interrupted' not in content or 'WebUI process restarted' not in content: + if 'Response interrupted' not in content or 'before this turn finished' not in content: return False expected = ' '.join(str(msg_text or '').split()) diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 78f5f4ece8..7464284ea8 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -87,9 +87,9 @@ If after running steps 1-4 the import still fails *and* `pip install -e .` succe ## "Response interrupted." marker keeps saying "no agent output was recovered" -**Symptom.** After the WebUI process restarts mid-turn (manual restart, OOM, crash, …), the affected chat shows an `**Response interrupted.**` marker with the wording *"The user message above was preserved, but no agent output was recovered."*, even though the run-journal for that turn is present on disk and contains the partial tokens the agent had already streamed. +**Symptom.** After a live response stream stops before a turn completes (manual restart, OOM, crash, browser/SSE disconnect, lost worker bookkeeping, …), the affected chat shows an `**Response interrupted.**` marker with the wording *"The user message above was preserved, but no agent output was recovered."*, even though the run-journal for that turn is present on disk and contains the partial tokens the agent had already streamed. -**Why.** Sidecar repair re-checks the run-journal at restart and uses the result as a one-shot signal. On WSL2 (9p / DrvFs) and on some network-backed setups, the run-journal `.jsonl` is written by the dead worker but the WebUI process reads it through a page-cache state that has not yet seen those writes — recovery returns "empty" and the marker is baked permanently. The fix introduces a *lazy* retry path: when sidecar repair cannot read visible output but knows the stream id, it stores a `_pending_journal_recovery` flag on the marker and re-attempts recovery from `get_session()` until the journal becomes readable (or the retry budget is exhausted). +**Why.** Sidecar repair re-checks the run-journal after it detects a stale stream and uses the result as a one-shot signal. On WSL2 (9p / DrvFs) and on some network-backed setups, the run-journal `.jsonl` is written by the stopped worker but the WebUI process reads it through a page-cache state that has not yet seen those writes — recovery returns "empty" and the marker is baked permanently. The fix introduces a *lazy* retry path: when sidecar repair cannot read visible output but knows the stream id, it stores a `_pending_journal_recovery` flag on the marker and re-attempts recovery from `get_session()` until the journal becomes readable (or the retry budget is exhausted). **Diagnostic.** diff --git a/tests/test_run_journal.py b/tests/test_run_journal.py index b7fb0b2d69..3fd96ac9e6 100644 --- a/tests/test_run_journal.py +++ b/tests/test_run_journal.py @@ -112,12 +112,16 @@ def test_stale_interrupted_event_reports_non_terminal_journal(tmp_path, monkeypa monkeypatch.setattr("api.run_journal._default_session_dir", lambda: tmp_path) event = stale_interrupted_event("session_1", "run_1") + assert event is not None assert event["event"] == "apperror" assert event["seq"] == 2 assert event["terminal_state"] == "stale-from-restart" assert event["payload"]["type"] == "interrupted" assert "last journaled event" in event["payload"]["hint"] + assert "process restarted" not in event["payload"]["message"] + assert "lost the live worker" not in event["payload"]["message"] + assert "live worker stopped" in event["payload"]["message"] def test_stale_interrupted_event_skips_terminal_journal(tmp_path, monkeypatch): diff --git a/tests/test_session_lost_response_regression.py b/tests/test_session_lost_response_regression.py index 3349652d39..04bddea6df 100644 --- a/tests/test_session_lost_response_regression.py +++ b/tests/test_session_lost_response_regression.py @@ -2,8 +2,8 @@ The scenario this test pins down: -1. A WebUI process restarts mid-stream. On the first sidecar repair attempt - the run-journal for the dead stream is NOT visible yet (page-cache loss, +1. A WebUI live response stream stops mid-turn. On the first sidecar repair + attempt the run-journal for the dead stream is NOT visible yet (page-cache loss, un-fsynced writes, slow network FS, etc.) so `_append_journaled_partial_output` returns False. 2. Pre-fix the repair path baked a permanent "no agent output was recovered" @@ -251,6 +251,27 @@ def test_state_db_middle_segment_replay_does_not_append_after_sidecar_tail(): assert merged[-1]["content"] == "opened browser preview" +def test_interrupted_recovery_markers_do_not_claim_restart_as_fact(): + """A stale live worker is not always a WebUI process restart. + + Broken SSE connections, browser disconnects, lost worker bookkeeping, and + real restarts all enter the same recovery marker path. User-visible wording + must describe the generic interruption instead of asserting a process + restart that systemd evidence may later disprove. + """ + marker_texts = [ + models._INTERRUPTED_RECOVERED_WORDING, + models._INTERRUPTED_NO_OUTPUT_WORDING, + models._INTERRUPTED_PENDING_RETRY_WORDING, + models._INTERRUPTED_NEUTRAL_WORDING, + ] + + for text in marker_texts: + assert "Response interrupted" in text + assert "process restarted" not in text + assert "before this turn finished" in text + + def test_lost_response_recovered_on_second_read(hermes_home): sid = "9f14583f0e4e4444aaaa111122223333" stream_id = "7c8b4108d52b4aba9af362d3a54f47ac" diff --git a/tests/test_session_sidecar_repair.py b/tests/test_session_sidecar_repair.py index cae192f5f5..44a6edb4de 100644 --- a/tests/test_session_sidecar_repair.py +++ b/tests/test_session_sidecar_repair.py @@ -319,7 +319,8 @@ def test_error_marker_no_preserved_as_draft(self, hermes_home, monkeypatch): f"Error marker should not say 'preserved as a draft', got: {content}" ) assert "Response interrupted" in content - assert "WebUI process restarted" in content + assert "live response stream stopped" in content + assert "WebUI process restarted" not in content # The marker now arms the lazy-retry hook when a stream id is known # ("Recovering the partial output… reload to retry."). The legacy # "user message above was preserved" wording is reserved for the @@ -624,7 +625,8 @@ def test_pending_cleared_when_messages_nonempty(self, hermes_home, monkeypatch): error_msgs = [m for m in s.messages if m.get("_error")] assert len(error_msgs) == 1 assert "Response interrupted" in error_msgs[0]["content"] - assert "WebUI process restarted" in error_msgs[0]["content"] + assert "live response stream stopped" in error_msgs[0]["content"] + assert "WebUI process restarted" not in error_msgs[0]["content"] assert error_msgs[0].get("type") == "interrupted" # Pending fields fully cleared From 2f1ca959f182c50c92dfb743ca323f225f0e1976 Mon Sep 17 00:00:00 2001 From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com> Date: Fri, 22 May 2026 11:08:08 +0200 Subject: [PATCH 024/349] fix(chat): classify interrupted response causes (cherry picked from commit 5c1e802cd6ee8565da74c7ffe57e6407fe21bf02) --- CHANGELOG.md | 2 +- api/models.py | 128 ++++++++++++++++-- api/routes.py | 2 +- api/run_journal.py | 2 +- docs/troubleshooting.md | 11 +- server.py | 10 ++ static/messages.js | 4 +- tests/test_run_journal.py | 2 +- tests/test_run_journal_routes.py | 4 +- .../test_session_lost_response_regression.py | 58 ++++++++ 10 files changed, 200 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64fa994fe4..c59ed1d9f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### Fixed -- Clarify `Response interrupted` recovery markers so they report that the live response stream stopped instead of asserting that the WebUI process restarted. The same stale-recovery path also covers browser/SSE disconnects and lost worker bookkeeping, so the marker now matches systemd evidence instead of implying a restart that did not happen. +- Clarify `Response interrupted` recovery markers so they report that the live response stream stopped instead of asserting that the WebUI process restarted. The recovery path now records distinct interruption causes for real process restarts, stream/run split-brain, and lost worker bookkeeping; browser-side SSE transport failures show a separate `Connection interrupted` message, and client-side `BrokenPipeError` disconnects no longer get logged as server 500s. ## [v0.51.131] — 2026-05-24 — Release DC (stage-batch13 — 6-PR notes-drawer + context-parity + PWA-swipe + locale polish) diff --git a/api/models.py b/api/models.py index 1317427bae..fd6161ec57 100644 --- a/api/models.py +++ b/api/models.py @@ -787,11 +787,87 @@ def _get_profile_home(profile) -> Path: 'Partial output may have been lost.' ) +_INTERRUPTION_CAUSE_DETAILS = { + 'process_restart': ( + 'Evidence: the WebUI process started after this turn began, so this ' + 'looks like a real process crash or restart.' + ), + 'stream_run_split_brain': ( + 'Evidence: the browser response stream was gone but the worker registry ' + 'still listed the run. This is a stream/run bookkeeping split-brain.' + ), + 'lost_worker_bookkeeping': ( + 'Evidence: the stream was gone and worker bookkeeping no longer had an ' + 'active run for it. This usually means the worker state was lost or ' + 'cleaned up without a terminal event.' + ), + 'unknown': ( + 'Evidence: the stream stopped, but the WebUI could not classify the ' + 'interruption more precisely.' + ), +} + + +def _classify_interruption_cause( + *, stream_id: str | None = None, pending_started_at=None, +) -> str: + """Classify the stale live-response state without overstating certainty.""" + try: + started = float(pending_started_at) if pending_started_at else None + except (TypeError, ValueError): + started = None + + if started is not None: + try: + if float(getattr(_cfg, 'SERVER_START_TIME', 0.0) or 0.0) > started: + return 'process_restart' + except (TypeError, ValueError): + pass + + if stream_id: + try: + with _cfg.ACTIVE_RUNS_LOCK: + if str(stream_id) in _cfg.ACTIVE_RUNS: + return 'stream_run_split_brain' + except Exception: + pass + return 'lost_worker_bookkeeping' + + return 'unknown' + + +def _interrupted_content_for( + *, recovered_output: bool, pending_retry: bool, interruption_cause: str, +) -> str: + if recovered_output: + outcome = ( + 'The partial output above was recovered from the run journal, ' + 'but the interrupted agent process could not continue.' + ) + elif pending_retry: + outcome = ( + 'Recovering the partial output from the run journal — ' + 'reload this session to retry.' + ) + else: + outcome = 'The user message above was preserved, but no agent output was recovered.' + cause_detail = _INTERRUPTION_CAUSE_DETAILS.get( + interruption_cause, + _INTERRUPTION_CAUSE_DETAILS['unknown'], + ) + return ( + '**Response interrupted.**\n\n' + 'The live response stream stopped before this turn finished. ' + f'{cause_detail} {outcome}' + ) + def _interrupted_recovery_marker( *, recovered_output: bool = False, pending_retry: bool = False, + stream_id: str | None = None, + pending_started_at=None, ) -> dict: """Build the standard interrupted-turn marker. @@ -809,18 +885,22 @@ def _interrupted_recovery_marker( set so the caller cannot accidentally re-arm retry on a successful repair. """ - if recovered_output: - content = _INTERRUPTED_RECOVERED_WORDING - elif pending_retry: - content = _INTERRUPTED_PENDING_RETRY_WORDING - else: - content = _INTERRUPTED_NO_OUTPUT_WORDING + interruption_cause = _classify_interruption_cause( + stream_id=stream_id, + pending_started_at=pending_started_at, + ) + content = _interrupted_content_for( + recovered_output=recovered_output, + pending_retry=pending_retry, + interruption_cause=interruption_cause, + ) marker = { 'role': 'assistant', 'content': content, 'timestamp': int(time.time()), '_error': True, 'type': 'interrupted', + 'interruption_cause': interruption_cause, } if pending_retry and not recovered_output: marker['_pending_journal_recovery'] = True @@ -1218,15 +1298,26 @@ def _journal_retry_lock_for_sid(sid: str) -> threading.Lock: def _build_recovery_marker_with_retry_hook( - *, recovered_output: bool, stream_id: str | None, + *, recovered_output: bool, stream_id: str | None, pending_started_at=None, ) -> dict: """Build an interrupted-turn marker, arming the lazy-retry hook when visible output was not recovered yet but a stream id is available.""" if recovered_output: - return _interrupted_recovery_marker(recovered_output=True) + return _interrupted_recovery_marker( + recovered_output=True, + stream_id=stream_id, + pending_started_at=pending_started_at, + ) if not stream_id: - return _interrupted_recovery_marker(recovered_output=False) - marker = _interrupted_recovery_marker(pending_retry=True) + return _interrupted_recovery_marker( + recovered_output=False, + pending_started_at=pending_started_at, + ) + marker = _interrupted_recovery_marker( + pending_retry=True, + stream_id=stream_id, + pending_started_at=pending_started_at, + ) marker['_journal_retry_stream_id'] = str(stream_id) marker['_journal_retry_attempts'] = 0 marker['_journal_retry_first_seen_ts'] = int(time.time()) @@ -1511,13 +1602,16 @@ def _apply_core_sync_or_error_marker( stream_id_for_recheck or session.active_stream_id, ) _stream_id = stream_id_for_recheck or session.active_stream_id + _pending_started_at = session.pending_started_at session.active_stream_id = None session.pending_user_message = None session.pending_attachments = [] session.pending_started_at = None session.messages.append( _build_recovery_marker_with_retry_hook( - recovered_output=recovered_output, stream_id=_stream_id, + recovered_output=recovered_output, + stream_id=_stream_id, + pending_started_at=_pending_started_at, ) ) session.save(touch_updated_at=touch_updated_at) @@ -1562,13 +1656,18 @@ def _apply_core_sync_or_error_marker( _stream_id, dedupe_existing=True, ) + _pending_started_at = session.pending_started_at session.active_stream_id = None session.pending_user_message = None session.pending_attachments = [] session.pending_started_at = None if recovered_output: session.messages.append( - _interrupted_recovery_marker(recovered_output=True) + _interrupted_recovery_marker( + recovered_output=True, + stream_id=_stream_id, + pending_started_at=_pending_started_at, + ) ) # NOTE: when the core transcript was synced in but the run journal # is not yet visible, intentionally do NOT append a lazy-retry @@ -1604,13 +1703,16 @@ def _apply_core_sync_or_error_marker( stream_id_for_recheck or session.active_stream_id, ) _stream_id = stream_id_for_recheck or session.active_stream_id + _pending_started_at = session.pending_started_at session.active_stream_id = None session.pending_user_message = None session.pending_attachments = [] session.pending_started_at = None session.messages.append( _build_recovery_marker_with_retry_hook( - recovered_output=recovered_output, stream_id=_stream_id, + recovered_output=recovered_output, + stream_id=_stream_id, + pending_started_at=_pending_started_at, ) ) session.save(touch_updated_at=touch_updated_at) diff --git a/api/routes.py b/api/routes.py index b2aef7f75f..8edc587293 100644 --- a/api/routes.py +++ b/api/routes.py @@ -1126,7 +1126,7 @@ def _run_journal_status_payload(summary: dict, *, active: bool = False) -> dict: terminal = bool(summary.get("terminal")) terminal_state = summary.get("terminal_state") if not active and not terminal: - terminal_state = "stale-from-restart" + terminal_state = "lost-worker-bookkeeping" return { "session_id": summary.get("session_id"), "run_id": summary.get("run_id"), diff --git a/api/run_journal.py b/api/run_journal.py index 92b42e50cf..53062fbf88 100644 --- a/api/run_journal.py +++ b/api/run_journal.py @@ -278,7 +278,7 @@ def stale_interrupted_event(session_id: str, run_id: str, *, after_seq: int | No "type": "apperror", "created_at": time.time(), "terminal": True, - "terminal_state": "stale-from-restart", + "terminal_state": "lost-worker-bookkeeping", "payload": payload, "synthetic": True, } diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 7464284ea8..2230b52e5a 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -87,9 +87,16 @@ If after running steps 1-4 the import still fails *and* `pip install -e .` succe ## "Response interrupted." marker keeps saying "no agent output was recovered" -**Symptom.** After a live response stream stops before a turn completes (manual restart, OOM, crash, browser/SSE disconnect, lost worker bookkeeping, …), the affected chat shows an `**Response interrupted.**` marker with the wording *"The user message above was preserved, but no agent output was recovered."*, even though the run-journal for that turn is present on disk and contains the partial tokens the agent had already streamed. +**Symptom.** After a live response stream stops before a turn completes (manual restart, OOM, crash, browser/SSE disconnect, lost worker bookkeeping, …), the affected chat shows an `**Response interrupted.**` marker. If the run-journal for that turn is already visible on disk, the marker says the partial output was recovered; if not, it preserves the user turn and says no agent output was recovered yet. -**Why.** Sidecar repair re-checks the run-journal after it detects a stale stream and uses the result as a one-shot signal. On WSL2 (9p / DrvFs) and on some network-backed setups, the run-journal `.jsonl` is written by the stopped worker but the WebUI process reads it through a page-cache state that has not yet seen those writes — recovery returns "empty" and the marker is baked permanently. The fix introduces a *lazy* retry path: when sidecar repair cannot read visible output but knows the stream id, it stores a `_pending_journal_recovery` flag on the marker and re-attempts recovery from `get_session()` until the journal becomes readable (or the retry budget is exhausted). +**Why.** Sidecar repair re-checks the run-journal after it detects a stale stream and uses the result as a one-shot signal. On WSL2 (9p / DrvFs) and on some network-backed setups, the run-journal `.jsonl` is written by the stopped worker but the WebUI process reads it through a page-cache state that has not yet seen those writes — recovery returns "empty" and the marker would otherwise be baked permanently. The fix introduces a *lazy* retry path: when sidecar repair cannot read visible output but knows the stream id, it stores a `_pending_journal_recovery` flag on the marker and re-attempts recovery from `get_session()` until the journal becomes readable (or the retry budget is exhausted). + +**Interruption classes.** The WebUI now keeps the user-facing cases separate instead of implying every stale stream was a restart: + +- **Browser/SSE connection interrupted** — the live browser `EventSource` transport dropped. The UI reports `Connection interrupted` and tries status/replay/session restore before showing the final browser-side notice. +- **Lost worker bookkeeping** — the stream id is gone and the worker registry no longer has an active run. Recovery markers carry `interruption_cause: "lost_worker_bookkeeping"` and `/api/chat/stream/status` reports `terminal_state: "lost-worker-bookkeeping"` for non-terminal journals that are no longer active. +- **Stream/run split-brain** — the stream is gone but `ACTIVE_RUNS` still lists the worker. Recovery markers carry `interruption_cause: "stream_run_split_brain"` so the transcript says this is a bookkeeping split-brain rather than a restart. +- **Process crash/restart** — `SERVER_START_TIME` is newer than `pending_started_at`, meaning the WebUI process started after the turn began. Recovery markers carry `interruption_cause: "process_restart"` and explicitly say the process-start evidence points to a crash or restart. **Diagnostic.** diff --git a/server.py b/server.py index e6a2c65a4a..f838d3372b 100644 --- a/server.py +++ b/server.py @@ -258,6 +258,11 @@ def do_GET(self) -> None: result = handle_get(self, parsed) if result is False: return j(self, {'error': 'not found'}, status=404) + except (BrokenPipeError, ConnectionResetError, ConnectionAbortedError): + # The browser/client closed the socket while we were writing the + # response. This is expected for probes, tab closes, and SSE + # reconnect races; do not convert it into a misleading server 500. + return except Exception as e: print(f'[webui] ERROR {self.command} {self.path}\n' + traceback.format_exc(), flush=True) return j(self, {'error': 'Internal server error'}, status=500) @@ -284,6 +289,11 @@ def _handle_write(self, route_func) -> None: result = route_func(self, parsed) if result is False: return j(self, {'error': 'not found'}, status=404) + except (BrokenPipeError, ConnectionResetError, ConnectionAbortedError): + # The browser/client closed the socket while we were writing the + # response. This is expected for probes, tab closes, and SSE + # reconnect races; do not convert it into a misleading server 500. + return except Exception as e: print(f'[webui] ERROR {self.command} {self.path}\n' + traceback.format_exc(), flush=True) return j(self, {'error': 'Internal server error'}, status=500) diff --git a/static/messages.js b/static/messages.js index f2cb32998c..7e55b7bb89 100644 --- a/static/messages.js +++ b/static/messages.js @@ -2245,12 +2245,12 @@ function attachLiveStream(activeSid, streamId, uploaded=[], options={}){ if(S.session&&S.session.session_id===activeSid){ S.activeStreamId=null; clearLiveToolCards();if(!assistantText)removeThinking(); - S.messages.push({role:'assistant',content:'**Error:** Connection lost'});renderMessages({preserveScroll:true}); + S.messages.push({role:'assistant',content:'**Connection interrupted:** The browser lost the live SSE connection before the response finished. If the worker completed, reopening this session should restore the settled transcript.'});renderMessages({preserveScroll:true}); _markSessionViewed(activeSid, S.messages.length); }else{ if(typeof trackBackgroundError==='function'){ const _errTitle=(typeof _allSessions!=='undefined'&&_allSessions.find(s=>s.session_id===activeSid)||{}).title||null; - trackBackgroundError(activeSid,_errTitle,'Connection lost'); + trackBackgroundError(activeSid,_errTitle,'Connection interrupted'); } } _setActivePaneIdleIfOwner(); diff --git a/tests/test_run_journal.py b/tests/test_run_journal.py index 3fd96ac9e6..22a7b24eb4 100644 --- a/tests/test_run_journal.py +++ b/tests/test_run_journal.py @@ -116,7 +116,7 @@ def test_stale_interrupted_event_reports_non_terminal_journal(tmp_path, monkeypa assert event["event"] == "apperror" assert event["seq"] == 2 - assert event["terminal_state"] == "stale-from-restart" + assert event["terminal_state"] == "lost-worker-bookkeeping" assert event["payload"]["type"] == "interrupted" assert "last journaled event" in event["payload"]["hint"] assert "process restarted" not in event["payload"]["message"] diff --git a/tests/test_run_journal_routes.py b/tests/test_run_journal_routes.py index a0a2b34be6..187541cf03 100644 --- a/tests/test_run_journal_routes.py +++ b/tests/test_run_journal_routes.py @@ -40,7 +40,7 @@ def test_replay_emits_event_ids_and_stale_restart_diagnostic(): def test_session_payload_exposes_runtime_journal_for_stale_streams(): assert "original_stream_id = getattr(s, \"active_stream_id\", None)" in ROUTES_SRC assert '"runtime_journal"' in ROUTES_SRC - assert 'terminal_state = "stale-from-restart"' in ROUTES_SRC + assert 'terminal_state = "lost-worker-bookkeeping"' in ROUTES_SRC def test_status_payload_marks_non_terminal_dead_journal_as_stale(): @@ -60,7 +60,7 @@ def test_status_payload_marks_non_terminal_dead_journal_as_stale(): ) assert payload["terminal"] is False - assert payload["terminal_state"] == "stale-from-restart" + assert payload["terminal_state"] == "lost-worker-bookkeeping" assert payload["last_event_id"] == "run_1:3" diff --git a/tests/test_session_lost_response_regression.py b/tests/test_session_lost_response_regression.py index 04bddea6df..3c9707b9e0 100644 --- a/tests/test_session_lost_response_regression.py +++ b/tests/test_session_lost_response_regression.py @@ -53,11 +53,13 @@ def _isolate_stream_state(): config.CANCEL_FLAGS.clear() config.AGENT_INSTANCES.clear() config.STREAM_PARTIAL_TEXT.clear() + config.ACTIVE_RUNS.clear() yield config.STREAMS.clear() config.CANCEL_FLAGS.clear() config.AGENT_INSTANCES.clear() config.STREAM_PARTIAL_TEXT.clear() + config.ACTIVE_RUNS.clear() @pytest.fixture(autouse=True) @@ -272,6 +274,62 @@ def test_interrupted_recovery_markers_do_not_claim_restart_as_fact(): assert "before this turn finished" in text +def test_interrupted_marker_distinguishes_real_process_restart(monkeypatch): + monkeypatch.setattr(config, "SERVER_START_TIME", 2000.0) + marker = models._interrupted_recovery_marker( + recovered_output=False, + stream_id="stream_crash", + pending_started_at=1000.0, + ) + + assert marker["interruption_cause"] == "process_restart" + assert "WebUI process started after this turn began" in marker["content"] + assert "process restarted" not in marker["content"] + + +def test_interrupted_marker_distinguishes_stream_run_split_brain(monkeypatch): + monkeypatch.setattr(config, "SERVER_START_TIME", 1000.0) + config.ACTIVE_RUNS["stream_split"] = {"session_id": "sid", "phase": "running"} + + marker = models._interrupted_recovery_marker( + recovered_output=False, + stream_id="stream_split", + pending_started_at=2000.0, + ) + + assert marker["interruption_cause"] == "stream_run_split_brain" + assert "stream was gone but the worker registry still listed the run" in marker["content"] + + +def test_interrupted_marker_distinguishes_lost_worker_bookkeeping(monkeypatch): + monkeypatch.setattr(config, "SERVER_START_TIME", 1000.0) + + marker = models._interrupted_recovery_marker( + recovered_output=False, + stream_id="stream_lost", + pending_started_at=2000.0, + ) + + assert marker["interruption_cause"] == "lost_worker_bookkeeping" + assert "worker bookkeeping no longer had an active run" in marker["content"] + + +def test_messages_js_names_browser_sse_disconnect_separately(): + repo = models.Path(__file__).parent.parent + js = (repo / "static" / "messages.js").read_text(encoding="utf-8") + + assert "Connection interrupted" in js + assert "browser lost the live SSE connection" in js + assert "Connection lost" not in js + + +def test_server_treats_broken_pipe_as_client_disconnect_not_500(): + server_py = (models.Path(__file__).parent.parent / "server.py").read_text(encoding="utf-8") + + assert "except (BrokenPipeError, ConnectionResetError, ConnectionAbortedError):" in server_py + assert "do not convert it into a misleading server 500" in server_py + + def test_lost_response_recovered_on_second_read(hermes_home): sid = "9f14583f0e4e4444aaaa111122223333" stream_id = "7c8b4108d52b4aba9af362d3a54f47ac" From 8a2f11c77099f98da213db90094e29a2504533b7 Mon Sep 17 00:00:00 2001 From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com> Date: Fri, 22 May 2026 11:29:32 +0200 Subject: [PATCH 025/349] fix(chat): log sanitized client sse diagnostics (cherry picked from commit 749ca6e18c5e307fbf7e7fb5fffce97249545017) --- CHANGELOG.md | 2 +- api/routes.py | 135 ++++++++++++++++++++- docs/troubleshooting.md | 2 +- static/messages.js | 7 +- static/sessions.js | 1 + static/workspace.js | 17 +++ tests/test_client_event_diagnostics.py | 158 +++++++++++++++++++++++++ 7 files changed, 316 insertions(+), 6 deletions(-) create mode 100644 tests/test_client_event_diagnostics.py diff --git a/CHANGELOG.md b/CHANGELOG.md index c59ed1d9f1..9c964954db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### Fixed -- Clarify `Response interrupted` recovery markers so they report that the live response stream stopped instead of asserting that the WebUI process restarted. The recovery path now records distinct interruption causes for real process restarts, stream/run split-brain, and lost worker bookkeeping; browser-side SSE transport failures show a separate `Connection interrupted` message, and client-side `BrokenPipeError` disconnects no longer get logged as server 500s. +- Clarify `Response interrupted` recovery markers so they report that the live response stream stopped instead of asserting that the WebUI process restarted. The recovery path now records distinct interruption causes for real process restarts, stream/run split-brain, and lost worker bookkeeping; browser-side SSE transport failures show a separate `Connection interrupted` message, client-side `BrokenPipeError` disconnects no longer get logged as server 500s, and chat/gateway SSE errors emit rate-limited, body-capped, sanitized client diagnostics to `/api/client-events/log` for future root-cause checks. The stream-status `terminal_state` value for lost-worker bookkeeping changes from `stale-from-restart` to `lost-worker-bookkeeping`, matching the new non-restart wording. ## [v0.51.131] — 2026-05-24 — Release DC (stage-batch13 — 6-PR notes-drawer + context-parity + PWA-swipe + locale polish) diff --git a/api/routes.py b/api/routes.py index 8edc587293..fe789dea55 100644 --- a/api/routes.py +++ b/api/routes.py @@ -23,7 +23,7 @@ import re from pathlib import Path from contextlib import closing -from urllib.parse import parse_qs +from urllib.parse import parse_qs, urlsplit from api.agent_sessions import ( MESSAGING_SOURCES, is_cli_session_row, @@ -75,6 +75,21 @@ _CSP_REPORT_RATE_LIMIT_WINDOW_SECONDS = 60 _CSP_REPORT_RATE_LIMIT_MAX = 100 _CSP_REPORT_MAX_BODY_BYTES = 64 * 1024 +_CLIENT_EVENT_LOGGER = logging.getLogger("client_event") +_CLIENT_EVENT_RATE_LIMIT: dict[str, list[float]] = {} +_CLIENT_EVENT_RATE_LIMIT_LOCK = threading.Lock() +_CLIENT_EVENT_RATE_LIMIT_WINDOW_SECONDS = 60 +_CLIENT_EVENT_RATE_LIMIT_MAX = 30 +_CLIENT_EVENT_MAX_BODY_BYTES = 4 * 1024 +_CLIENT_EVENT_ALLOWED_FIELDS = { + "event": 64, + "source": 80, + "session_id": 128, + "stream_id": 128, + "visibility_state": 32, + "url_path": 256, + "reason": 160, +} def _session_field(session, field, default=None): @@ -1371,6 +1386,20 @@ def _csp_report_rate_limited(handler, *, now: float | None = None) -> bool: return False +def _client_event_rate_limited(handler, *, now: float | None = None) -> bool: + now = time.time() if now is None else now + key = _client_ip_for_rate_limit(handler) + cutoff = now - _CLIENT_EVENT_RATE_LIMIT_WINDOW_SECONDS + with _CLIENT_EVENT_RATE_LIMIT_LOCK: + timestamps = [ts for ts in _CLIENT_EVENT_RATE_LIMIT.get(key, []) if ts >= cutoff] + if len(timestamps) >= _CLIENT_EVENT_RATE_LIMIT_MAX: + _CLIENT_EVENT_RATE_LIMIT[key] = timestamps + return True + timestamps.append(now) + _CLIENT_EVENT_RATE_LIMIT[key] = timestamps + return False + + def _send_no_content(handler, status: int = 204) -> bool: handler.send_response(status) handler.send_header("Content-Length", "0") @@ -1410,6 +1439,105 @@ def _handle_csp_report(handler) -> bool: return _send_no_content(handler) +def _bounded_client_event_string(value, limit: int) -> str | None: + if value is None: + return None + text = str(value).strip() + if not text: + return None + return text[:limit] + + +def _sanitize_client_event_url_path(value) -> str | None: + text = _bounded_client_event_string(value, 1024) + if not text: + return None + try: + parsed = urlsplit(text) + path = parsed.path or "/" + except Exception: + path = text.split("?", 1)[0] or "/" + if not path.startswith("/"): + path = "/" + path.lstrip("/") + return path[: _CLIENT_EVENT_ALLOWED_FIELDS["url_path"]] + + +def _sanitize_client_event_payload(payload: dict | None) -> dict: + """Whitelist tiny browser diagnostic events and discard sensitive content. + + Client-side SSE diagnostics should explain transport failures without + persisting prompts, cookies, query strings, headers, or arbitrary browser + payloads. This helper intentionally keeps only bounded scalar metadata. + """ + if not isinstance(payload, dict): + return {"event": "unknown"} + sanitized: dict[str, object] = {} + for field, limit in _CLIENT_EVENT_ALLOWED_FIELDS.items(): + if field == "url_path": + value = _sanitize_client_event_url_path(payload.get(field)) + else: + value = _bounded_client_event_string(payload.get(field), limit) + if value is not None: + sanitized[field] = value + ready_state = payload.get("ready_state") + if isinstance(ready_state, bool): + pass + elif isinstance(ready_state, int) and 0 <= ready_state <= 3: + sanitized["ready_state"] = ready_state + online = payload.get("online") + if isinstance(online, bool): + sanitized["online"] = online + elif isinstance(online, str): + lowered = online.strip().lower() + if lowered in {"true", "1", "yes", "on"}: + sanitized["online"] = True + elif lowered in {"false", "0", "no", "off"}: + sanitized["online"] = False + if "event" not in sanitized: + sanitized["event"] = "unknown" + return sanitized + + +def _read_client_event_payload(handler) -> dict: + try: + length = int(handler.headers.get("Content-Length", 0)) + except Exception: + length = 0 + if length > _CLIENT_EVENT_MAX_BODY_BYTES: + try: + handler.rfile.read(_CLIENT_EVENT_MAX_BODY_BYTES) + except Exception: + pass + # Do not leave unread request-body bytes on an HTTP/1.1 keep-alive + # socket. Draining an arbitrary oversized body can tie up a worker; + # closing the connection after the bounded read preserves framing for + # the next request without turning diagnostics into a slow-drain sink. + try: + handler.close_connection = True + except Exception: + pass + return {"event": "discarded", "reason": "body_too_large"} + raw = handler.rfile.read(length) if length else b"{}" + try: + decoded = raw.decode("utf-8") + payload = json.loads(decoded) + except Exception: + return {"event": "invalid", "reason": "invalid_json"} + return payload if isinstance(payload, dict) else {"event": "invalid", "reason": "not_object"} + + +def _handle_client_event_log(handler, body: dict) -> bool: + if _client_event_rate_limited(handler): + _CLIENT_EVENT_LOGGER.warning( + "Dropped client event from %s: rate limit exceeded", + _client_ip_for_rate_limit(handler), + ) + return j(handler, {"ok": False, "error": "rate_limited"}, status=429) or True + payload = _sanitize_client_event_payload(body) + _CLIENT_EVENT_LOGGER.info("Client event from %s: %s", _client_ip_for_rate_limit(handler), payload) + return j(handler, {"ok": True, "event": payload.get("event")}) or True + + def _normalize_provider_id(value: str | None) -> str: raw = str(value or "").strip().lower() if not raw: @@ -4708,6 +4836,11 @@ def handle_post(handler, parsed) -> bool: if parsed.path == "/api/transcribe": return handle_transcribe(handler) + if parsed.path == "/api/client-events/log": + if diag: + diag.stage("read_client_event_body") + return _handle_client_event_log(handler, _read_client_event_payload(handler)) + if diag: diag.stage("read_body") try: diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 2230b52e5a..1984ff1843 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -93,7 +93,7 @@ If after running steps 1-4 the import still fails *and* `pip install -e .` succe **Interruption classes.** The WebUI now keeps the user-facing cases separate instead of implying every stale stream was a restart: -- **Browser/SSE connection interrupted** — the live browser `EventSource` transport dropped. The UI reports `Connection interrupted` and tries status/replay/session restore before showing the final browser-side notice. +- **Browser/SSE connection interrupted** — the live browser `EventSource` transport dropped. The UI reports `Connection interrupted` and tries status/replay/session restore before showing the final browser-side notice. Chat and gateway SSE errors also POST a small sanitized diagnostic event to `/api/client-events/log` (source, session id, stream id, readyState, visibility, online state, path without query string) so server logs can distinguish browser transport loss from backend worker loss. - **Lost worker bookkeeping** — the stream id is gone and the worker registry no longer has an active run. Recovery markers carry `interruption_cause: "lost_worker_bookkeeping"` and `/api/chat/stream/status` reports `terminal_state: "lost-worker-bookkeeping"` for non-terminal journals that are no longer active. - **Stream/run split-brain** — the stream is gone but `ACTIVE_RUNS` still lists the worker. Recovery markers carry `interruption_cause: "stream_run_split_brain"` so the transcript says this is a bookkeeping split-brain rather than a restart. - **Process crash/restart** — `SERVER_START_TIME` is newer than `pending_started_at`, meaning the WebUI process started after the turn began. Recovery markers carry `interruption_cause: "process_restart"` and explicitly say the process-start evidence points to a crash or restart. diff --git a/static/messages.js b/static/messages.js index 7e55b7bb89..f10b5d9d12 100644 --- a/static/messages.js +++ b/static/messages.js @@ -2080,13 +2080,14 @@ function attachLiveStream(activeSid, streamId, uploaded=[], options={}){ }); source.addEventListener('error',async e=>{ - source.close(); - if(_deferStreamErrorIfOffline()) return; - if(_deferStreamErrorIfPageHidden()) return; if(_terminalStateReached || _streamFinalized){ _closeSource(); return; } + if(typeof recordClientSSEError==='function') recordClientSSEError('chat-response',{ready_state:source?source.readyState:null,session_id:activeSid,stream_id:streamId,reason:'chat EventSource.onerror'}); + source.close(); + if(_deferStreamErrorIfOffline()) return; + if(_deferStreamErrorIfPageHidden()) return; // Attempt one reconnect if the stream is still active server-side if(!_reconnectAttempted && streamId){ _reconnectAttempted=true; diff --git a/static/sessions.js b/static/sessions.js index f57b5d9c02..83d8c5c4e7 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -2438,6 +2438,7 @@ function startGatewaySSE(){ }catch(e){ /* ignore parse errors */ } }); _gatewaySSE.onerror = () => { + if(typeof recordClientSSEError==='function') recordClientSSEError('gateway-sessions',{ready_state:_gatewaySSE?_gatewaySSE.readyState:null,reason:'gateway EventSource.onerror'}); if(_gatewaySSE){ _gatewaySSE.close(); _gatewaySSE = null; diff --git a/static/workspace.js b/static/workspace.js index f5972d067f..7562c0f07f 100644 --- a/static/workspace.js +++ b/static/workspace.js @@ -85,6 +85,23 @@ async function api(path,opts={}){ throw lastErr; } +function recordClientSSEError(source, details={}){ + try{ + const payload={ + event:'sse_error', + source:String(source||'unknown'), + ready_state:details.ready_state, + session_id:details.session_id||null, + stream_id:details.stream_id||null, + visibility_state:(typeof document!=='undefined'&&document.visibilityState)||'unknown', + online:(typeof navigator!=='undefined'&&typeof navigator.onLine==='boolean')?navigator.onLine:null, + url_path:(typeof location!=='undefined'&&location.pathname)||'/', + reason:details.reason||'EventSource.onerror', + }; + void api('/api/client-events/log',{method:'POST',body:JSON.stringify(payload),timeoutMs:3000}).catch(()=>{}); + }catch(_){} +} + // Persist/restore expanded directory state per workspace in localStorage function _wsExpandKey(){ const ws=S.session&&S.session.workspace; diff --git a/tests/test_client_event_diagnostics.py b/tests/test_client_event_diagnostics.py new file mode 100644 index 0000000000..e7de46dc6b --- /dev/null +++ b/tests/test_client_event_diagnostics.py @@ -0,0 +1,158 @@ +"""Regression coverage for browser-side SSE disconnect diagnostics. + +When an EventSource fails in the browser, the server normally only sees a dead +socket or follow-up probe. Persisting a small, sanitized client event makes the +next incident diagnosable without logging prompt text or credentials. +""" +from pathlib import Path +from io import BytesIO +from types import SimpleNamespace + +import api.routes as routes + + +REPO = Path(__file__).resolve().parents[1] +WORKSPACE_JS = (REPO / "static" / "workspace.js").read_text(encoding="utf-8") +SESSIONS_JS = (REPO / "static" / "sessions.js").read_text(encoding="utf-8") +MESSAGES_JS = (REPO / "static" / "messages.js").read_text(encoding="utf-8") + + +def test_client_event_log_sanitizes_and_whitelists_fields(): + payload = { + "event": "sse_error", + "source": "gateway-sessions", + "session_id": "abc123", + "stream_id": "stream456", + "ready_state": 2, + "visibility_state": "hidden", + "online": True, + "url_path": "/chat/abc123?debug=1", + "reason": "onerror", + "password": "must-not-survive", + "content": "prompt text must not survive", + "cookie": "session=secret", + } + + sanitized = routes._sanitize_client_event_payload(payload) + + assert sanitized == { + "event": "sse_error", + "source": "gateway-sessions", + "session_id": "abc123", + "stream_id": "stream456", + "ready_state": 2, + "visibility_state": "hidden", + "online": True, + "url_path": "/chat/abc123", + "reason": "onerror", + } + assert "secret" not in repr(sanitized) + assert "prompt text" not in repr(sanitized) + + +def test_client_event_log_bounds_untrusted_values(): + payload = { + "event": "x" * 200, + "source": "chat" * 100, + "session_id": "s" * 200, + "stream_id": "t" * 200, + "ready_state": "not-a-number", + "visibility_state": "visible" * 40, + "online": "yes", + "url_path": "https://example.invalid/path?debug=1", + "reason": "network" * 80, + } + + sanitized = routes._sanitize_client_event_payload(payload) + + assert sanitized["event"] == "x" * 64 + assert len(sanitized["source"]) == 80 + assert len(sanitized["session_id"]) == 128 + assert len(sanitized["stream_id"]) == 128 + assert "ready_state" not in sanitized + assert sanitized["visibility_state"] == ("visible" * 40)[:32] + assert sanitized["online"] is True + assert sanitized["url_path"] == "/path" + assert len(sanitized["reason"]) == 160 + + +def test_client_event_log_route_is_wired(monkeypatch): + captured = {} + + body_bytes = b'{"event":"sse_error","source":"chat-response"}' + + def fake_handle(handler, body): + captured["body"] = body + return True + + monkeypatch.setattr(routes, "_check_csrf", lambda handler: True) + monkeypatch.setattr(routes, "_handle_client_event_log", fake_handle) + + handler = SimpleNamespace(headers={"Content-Length": str(len(body_bytes))}, rfile=BytesIO(body_bytes)) + handled = routes.handle_post(handler, SimpleNamespace(path="/api/client-events/log")) + + assert handled is True + assert captured["body"] == {"event": "sse_error", "source": "chat-response"} + + +def test_client_event_log_has_endpoint_specific_body_cap(): + too_large = b"{" + b"x" * (routes._CLIENT_EVENT_MAX_BODY_BYTES + 32) + b"}" + handler = SimpleNamespace( + headers={"Content-Length": str(len(too_large))}, + rfile=BytesIO(too_large), + close_connection=False, + ) + + payload = routes._read_client_event_payload(handler) + + assert payload == {"event": "discarded", "reason": "body_too_large"} + assert handler.rfile.tell() == routes._CLIENT_EVENT_MAX_BODY_BYTES + assert handler.close_connection is True + + +def test_client_event_log_rate_limits_per_client(monkeypatch): + routes._CLIENT_EVENT_RATE_LIMIT.clear() + monkeypatch.setattr(routes, "j", lambda handler, payload, status=200: payload.update({"status": status}) or True) + handler = SimpleNamespace(client_address=("203.0.113.10", 1234)) + + for i in range(routes._CLIENT_EVENT_RATE_LIMIT_MAX): + assert routes._handle_client_event_log(handler, {"event": f"sse_error_{i}"}) is True + + limited = {} + monkeypatch.setattr(routes, "j", lambda handler, payload, status=200: limited.update(payload, status=status) or True) + assert routes._handle_client_event_log(handler, {"event": "sse_error_over_limit"}) is True + + assert limited == {"ok": False, "error": "rate_limited", "status": 429} + routes._CLIENT_EVENT_RATE_LIMIT.clear() + + +def test_workspace_js_defines_sanitized_client_sse_error_reporter(): + helper_start = WORKSPACE_JS.index("function recordClientSSEError") + helper_block = WORKSPACE_JS[helper_start:helper_start + 900] + assert "api/client-events/log" in helper_block + assert "document.visibilityState" in helper_block + assert "navigator.onLine" in helper_block + assert "location.pathname" in helper_block + assert "location.search" not in helper_block + + +def test_sessions_js_reports_gateway_sse_errors_with_browser_context(): + gateway_block_start = SESSIONS_JS.index("_gatewaySSE.onerror = () =>") + gateway_block = SESSIONS_JS[gateway_block_start:gateway_block_start + 400] + assert "recordClientSSEError('gateway-sessions'" in gateway_block + assert "probeGatewaySSEStatus" in gateway_block + + +def test_messages_js_reports_chat_sse_errors_with_stream_identity(): + error_block_start = MESSAGES_JS.index("source.addEventListener('error',async e=>") + error_block = MESSAGES_JS[error_block_start:error_block_start + 900] + assert "recordClientSSEError('chat-response'" in error_block + assert "session_id:activeSid" in error_block + assert "stream_id:streamId" in error_block + + +def test_messages_js_keeps_finalized_stream_guard_before_diagnostic_report(): + error_block_start = MESSAGES_JS.index("source.addEventListener('error',async e=>") + error_block = MESSAGES_JS[error_block_start:error_block_start + 900] + assert "_streamFinalized" in error_block + assert error_block.index("_streamFinalized") < error_block.index("recordClientSSEError") From 15cde132f3b8ea757987f600b74fdba69ce6ab9a Mon Sep 17 00:00:00 2001 From: Lumen Yang Date: Thu, 21 May 2026 05:42:19 +0000 Subject: [PATCH 026/349] fix: dedupe replayed context summaries --- api/streaming.py | 79 +++++++++++++++++-- tests/test_issue1217_transcript_compaction.py | 61 ++++++++++++++ 2 files changed, 134 insertions(+), 6 deletions(-) diff --git a/api/streaming.py b/api/streaming.py index db6488030f..35233482aa 100644 --- a/api/streaming.py +++ b/api/streaming.py @@ -2399,8 +2399,68 @@ def _strip_replayed_prefix(existing_messages, candidates): return candidates -def _dedupe_replayed_active_context(previous_context, result_messages): - """Keep model context append-only without re-appending a replayed tail.""" +def _looks_like_replayed_session_arc_summary(previous_msg, candidate_msg): + """Return True for repeated LCM/session summaries with refreshed hints. + + LCM summary cards can be re-injected with the same long recovered context + and a different tail such as an expand hint. Exact identity misses those, + but appending both copies bloats every later model prompt. + """ + if not isinstance(previous_msg, dict) or not isinstance(candidate_msg, dict): + return False + if previous_msg.get('role') != candidate_msg.get('role'): + return False + previous_text = " ".join(_message_text(previous_msg.get('content', '')).split()) + candidate_text = " ".join(_message_text(candidate_msg.get('content', '')).split()) + if len(previous_text) < 2000 or len(candidate_text) < 2000: + return False + marker = '[Session Arc Summary' + if not previous_text.startswith(marker) or not candidate_text.startswith(marker): + return False + return previous_text[:1500] == candidate_text[:1500] + + +def _strip_replayed_context_items(existing_messages, candidates): + """Drop replayed non-adjacent context blocks before persisting context.""" + existing_messages = list(existing_messages or []) + candidates = list(candidates or []) + if not existing_messages or not candidates: + return candidates + + existing_keys = [_message_replay_key(m) for m in existing_messages] + candidate_keys = [_message_replay_key(m) for m in candidates] + existing_large = [m for m in existing_messages if isinstance(m, dict)] + cleaned = [] + idx = 0 + min_block = 3 + while idx < len(candidates): + msg = candidates[idx] + if any(_looks_like_replayed_session_arc_summary(prev, msg) for prev in existing_large): + idx += 1 + continue + + best = 0 + for start in range(len(existing_keys)): + length = 0 + while ( + idx + length < len(candidate_keys) + and start + length < len(existing_keys) + and candidate_keys[idx + length] == existing_keys[start + length] + ): + length += 1 + if length > best: + best = length + if best >= min_block: + idx += best + continue + + cleaned.append(msg) + idx += 1 + return cleaned + + +def _dedupe_replayed_context_messages(previous_context, result_messages): + """Keep model context append-only without replayed blocks/summaries.""" previous_context = list(previous_context or []) result_messages = list(result_messages or []) if not previous_context or not result_messages: @@ -2408,7 +2468,14 @@ def _dedupe_replayed_active_context(previous_context, result_messages): if not _messages_have_prefix(result_messages, previous_context): return result_messages candidates = result_messages[len(previous_context):] - return previous_context + _strip_replayed_prefix(previous_context, candidates) + candidates = _strip_replayed_prefix(previous_context, candidates) + candidates = _strip_replayed_context_items(previous_context, candidates) + return previous_context + candidates + + +def _dedupe_replayed_active_context(previous_context, result_messages): + """Keep model context append-only without re-appending a replayed tail.""" + return _dedupe_replayed_context_messages(previous_context, result_messages) def _is_context_compression_marker(msg): @@ -4576,7 +4643,7 @@ def _periodic_checkpoint(): _previous_context_messages, _result_messages, ) - _next_context_messages = _dedupe_replayed_active_context( + _next_context_messages = _dedupe_replayed_context_messages( _previous_context_messages, _next_context_messages, ) @@ -4723,7 +4790,7 @@ def _periodic_checkpoint(): _previous_context_messages, _result_messages, ) - _next_context_messages = _dedupe_replayed_active_context( + _next_context_messages = _dedupe_replayed_context_messages( _previous_context_messages, _next_context_messages, ) @@ -5549,7 +5616,7 @@ def _periodic_checkpoint(): _next_context_messages = _restore_reasoning_metadata( _previous_context_messages, _result_messages, ) - _next_context_messages = _dedupe_replayed_active_context( + _next_context_messages = _dedupe_replayed_context_messages( _previous_context_messages, _next_context_messages, ) diff --git a/tests/test_issue1217_transcript_compaction.py b/tests/test_issue1217_transcript_compaction.py index 4549cb823f..ab35a6d7b5 100644 --- a/tests/test_issue1217_transcript_compaction.py +++ b/tests/test_issue1217_transcript_compaction.py @@ -6,6 +6,7 @@ _assistant_reply_added_after_current_turn, _context_messages_for_new_turn, _dedupe_replayed_active_context, + _dedupe_replayed_context_messages, _merge_display_messages_after_agent_result, _new_turn_context_from_messages, _sanitize_messages_for_api, @@ -310,6 +311,66 @@ def test_repeated_user_text_after_compaction_is_not_dropped(): ] +def test_near_duplicate_session_arc_summary_is_not_replayed_in_context(): + summary_a = { + "role": "user", + "content": "[Session Arc Summary (d1, node 39)]\n" + + "same recovered LCM context\n" * 260 + + "expand hint: old node", + } + summary_b = { + "role": "user", + "content": "[Session Arc Summary (d1, node 39)]\n" + + "same recovered LCM context\n" * 260 + + "expand hint: refreshed node", + } + previous_context = [summary_a, {"role": "user", "content": "choose agent"}] + result_messages = previous_context + [ + {"role": "assistant", "content": "agent answer"}, + summary_b, + {"role": "user", "content": "next question"}, + ] + + next_context = _dedupe_replayed_context_messages(previous_context, result_messages) + + assert [m["content"] for m in next_context] == [ + summary_a["content"], + "choose agent", + "agent answer", + "next question", + ] + + +def test_non_adjacent_replayed_context_block_is_not_appended_again(): + previous_context = [ + {"role": "user", "content": "older setup"}, + {"role": "user", "content": "choose agent"}, + {"role": "assistant", "content": "checking agents"}, + {"role": "tool", "content": "agent list"}, + {"role": "assistant", "content": "agent answer"}, + ] + result_messages = previous_context + [ + {"role": "assistant", "content": "[CONTEXT COMPACTION — REFERENCE ONLY] compacted"}, + {"role": "user", "content": "choose agent"}, + {"role": "assistant", "content": "checking agents"}, + {"role": "tool", "content": "agent list"}, + {"role": "assistant", "content": "agent answer"}, + {"role": "user", "content": "next question"}, + ] + + next_context = _dedupe_replayed_context_messages(previous_context, result_messages) + + assert [m["content"] for m in next_context] == [ + "older setup", + "choose agent", + "checking agents", + "agent list", + "agent answer", + "[CONTEXT COMPACTION — REFERENCE ONLY] compacted", + "next question", + ] + + def test_session_context_falls_back_to_display_messages_for_legacy_sessions(tmp_path): messages = [ {"role": "user", "content": "legacy prompt"}, From 50c69713cc8de4d755058d4fb917ff475ab0fafb Mon Sep 17 00:00:00 2001 From: Lumen Yang Date: Thu, 21 May 2026 06:47:44 +0000 Subject: [PATCH 027/349] fix: reconcile state db delta after context --- api/models.py | 54 +++++++ pr-artifacts/context-replay-failure-cases.md | 143 ++++++++++++++++++ tests/test_issue1217_transcript_compaction.py | 131 ++++++++++++++++ 3 files changed, 328 insertions(+) create mode 100644 pr-artifacts/context-replay-failure-cases.md diff --git a/api/models.py b/api/models.py index fd6161ec57..909f3f61dc 100644 --- a/api/models.py +++ b/api/models.py @@ -3235,6 +3235,58 @@ def _has_visible_duplicate(visible_key: tuple, visible_keys: set[tuple]) -> bool return _matching_visible_duplicate(visible_key, visible_keys) is not None +def state_db_delta_after_context(sidecar_context: list, state_messages: list) -> list: + """Return only state.db rows that are newer than model-facing context. + + `context_messages` is the authoritative model-facing prefix. state.db may + contain a mirrored copy of that prefix with fresh timestamps, especially for + LCM/continuation sessions. Appending the whole state transcript to a clean + sidecar context replays old context into the next runtime prompt. + """ + sidecar_context = list(sidecar_context or []) + state_messages = list(state_messages or []) + if not sidecar_context or not state_messages: + return state_messages + + sidecar_keys = [_session_message_content_key(m) for m in sidecar_context] + state_keys = [_session_message_content_key(m) for m in state_messages] + max_offset = min(len(sidecar_keys), len(state_keys)) + best_len = 0 + for offset in range(max_offset): + length = 0 + while ( + offset + length < len(sidecar_keys) + and length < len(state_keys) + and sidecar_keys[offset + length] == state_keys[length] + ): + length += 1 + if length > best_len: + best_len = length + + # Require at least two mirrored rows. A single repeated short user message + # is not enough evidence that state.db starts with a mirrored context + # segment, but small recovered contexts often contain only a compact summary + # and one follow-up row; those should still use the delta path. + if best_len < 2: + return state_messages + + sidecar_key_set = set(sidecar_keys) + last_represented_state_index = best_len - 1 + for idx, key in enumerate(state_keys[best_len:], start=best_len): + if key in sidecar_key_set: + last_represented_state_index = idx + + delta = [] + for msg, key in zip( + state_messages[last_represented_state_index + 1:], + state_keys[last_represented_state_index + 1:], + ): + if key in sidecar_key_set: + continue + delta.append(msg) + return delta + + def merge_session_messages_append_only(sidecar_messages: list, state_messages: list) -> list: """Merge sidecar/context and state.db messages without deleting local rows.""" sidecar_messages = list(sidecar_messages or []) @@ -3340,6 +3392,8 @@ def reconciled_state_db_messages_for_session( local_messages = getattr(session, 'messages', None) or [] if state_messages is None: state_messages = get_state_db_session_messages(getattr(session, 'session_id', None)) + if prefer_context and local_messages: + state_messages = state_db_delta_after_context(local_messages, state_messages) return merge_session_messages_append_only(local_messages, state_messages) diff --git a/pr-artifacts/context-replay-failure-cases.md b/pr-artifacts/context-replay-failure-cases.md new file mode 100644 index 0000000000..3901a45963 --- /dev/null +++ b/pr-artifacts/context-replay-failure-cases.md @@ -0,0 +1,143 @@ +# Context replay / progress-ring failure cases + +This artifact records concrete failure cases observed while debugging WebUI + LCM context replay. It is intended to support an upstream PR with reproducible rationale. + +## A. Compression continuation replays active tail into display/context + +Observed shape after compression/continuation: + +```text +previous_context = [summary, A, B, C] +result_messages = previous_context + [A, B, C, D] +old saved context/display = [summary, A, B, C, A, B, C, D] +expected = [summary, A, B, C, D] +``` + +Code-level cause: writeback assumed `result_messages[len(previous_context):]` was all new delta. After LCM/session rollover, the agent may replay the active tail after the compacted prefix, so this assumption is false. + +Regression target: strip candidate prefixes that are already suffixes of existing context/display. + +## B. Near-duplicate large Session Arc Summary cards + +Observed in WebUI sidecar display transcript for sessions in the `20260520_200424_a43cef` / `20260520_201320_a95eac` lineage: + +```text +[Session Arc Summary (d1, node 39)] ... 62k chars +[Session Arc Summary (d1, node 39)] ... 62k chars +[Session Arc Summary (d1, node 39)] ... 74k chars +``` + +These summaries shared thousands of identical prefix characters but differed in tails/expand hints. Exact identity checks missed them. One duplicated ~80k char summary explains a ~20k-token jump. + +Regression target: treat large `[Session Arc Summary ...]` messages with the same long prefix as replayed summary artifacts. + +## C. Non-adjacent replay blocks separated by markers/summaries + +Observed display transcript contained repeated blocks that were not immediately adjacent, e.g. best block lengths around 171 messages in historical `messages`: + +```text +A B C ... [compression marker / summary / unrelated rows] ... A B C +``` + +Adjacent-only dedupe falsely reported clean. This matters because LCM/continuation can insert compression cards, cron banners, or summary messages between original block and replayed tail. + +Regression target: detect and strip replayed non-adjacent blocks when appending model context candidates. + +## D. Non-streaming `/api/chat` writeback missed dedupe + +Observed session: `20260521_060755_294aed`. + +User asked a short question with no meaningful new tool usage: + +```text +这是一个内部服务对么？简答 +``` + +Before cleanup: + +```text +context_messages: 136 +best replay: 67 messages repeated from index 0 at index 67 +last_prompt_tokens: 136668 (~53.4% of 256k) +``` + +Expected shape was: + +```text +previous_context(67) + new_user + new_assistant = 69 messages +``` + +Actual cause: streaming writeback used `_dedupe_replayed_context_messages`, but synchronous `/api/chat` wrote `_restore_reasoning_metadata(previous_context, result_messages)` directly to `s.context_messages`. + +Regression target: both streaming and non-streaming writeback paths must use the same replay-dedupe guard. + +## E. Runtime/progress-ring jump: clean persisted context, polluted turn-start reconciliation + +Observed session: `20260521_060755_294aed` after cleanup and deployment. + +Persisted sidecar after pause/cancel: + +```text +context_messages: 69 +context chars: 199,972 +rough content tokens: ~49,993 +last_prompt_tokens: 86,723 (~33.9%) +``` + +But starting/continuing a streaming turn made the progress ring jump to ~55%. Simulating the turn-start code path showed: + +```text +ctx_before_agent: 154 messages +chars: 448,438 +rough content tokens: ~112,109 +``` + +After applying existing final-writeback dedupe to that runtime prompt: + +```text +after_current_dedupe: 85 messages +chars: 248,466 +rough content tokens: ~62,116 +``` + +So the ring was not randomly wrong: it reflected a polluted runtime prompt estimate. The persisted sidecar stayed clean because final writeback/cancel did not save the runtime replay. + +Code-level cause: streaming turn start does: + +```python +_previous_context_messages = _new_turn_context_from_messages( + reconciled_state_db_messages_for_session( + s, + prefer_context=True, + state_messages=_external_state_messages, + ), + msg_text, +) +``` + +When `prefer_context=True`, sidecar `context_messages` are clean, but `state.db` still contains mirrored/replayed transcript rows. `reconciled_state_db_messages_for_session` append-only merges `context_messages + whole state transcript`, so the agent/runtime prompt temporarily receives old transcript rows again. + +Regression target: when `prefer_context=True` and sidecar `context_messages` exists, reconciliation must return: + +```text +clean sidecar context + truly newer state.db delta +``` + +not: + +```text +clean sidecar context + full state.db transcript +``` + +## PR thesis + +The bug family is not a model behavior issue. It is a WebUI persistence/reconciliation invariant violation: + +> Model-facing context is append-only, but append candidates may contain replayed context due to LCM/session continuation/state-db mirroring. Every boundary that merges result/state messages into model context must strip replayed prefixes/blocks and must distinguish clean sidecar context from full display/state transcripts. + +Key invariant for upstream: + +```text +If context_messages exists, it is the authoritative model-facing prefix. +State/db/display histories may be fuller/noisier and should only contribute messages that are demonstrably newer than that prefix. +``` diff --git a/tests/test_issue1217_transcript_compaction.py b/tests/test_issue1217_transcript_compaction.py index ab35a6d7b5..e45e9d1178 100644 --- a/tests/test_issue1217_transcript_compaction.py +++ b/tests/test_issue1217_transcript_compaction.py @@ -371,6 +371,137 @@ def test_non_adjacent_replayed_context_block_is_not_appended_again(): ] + + +def test_prefer_context_reconcile_strips_state_db_mirrored_prefix(): + sidecar_context = [ + {"role": "assistant", "content": "cron banner"}, + {"role": "user", "content": "[Session Arc Summary]"}, + {"role": "assistant", "content": "old answer"}, + {"role": "user", "content": "latest saved question", "timestamp": 200.0}, + {"role": "assistant", "content": "latest saved answer", "timestamp": 201.0}, + ] + state_messages = [ + {"role": "assistant", "content": "cron banner", "timestamp": 100.0}, + {"role": "user", "content": "[Session Arc Summary]", "timestamp": 101.0}, + {"role": "assistant", "content": "old answer", "timestamp": 102.0}, + {"role": "user", "content": "latest saved question", "timestamp": 200.0}, + {"role": "assistant", "content": "latest saved answer", "timestamp": 201.0}, + {"role": "user", "content": "continue", "timestamp": 300.0}, + ] + session = SimpleNamespace( + session_id="prefix-replay", + context_messages=sidecar_context, + messages=[], + ) + + reconciled = reconciled_state_db_messages_for_session( + session, prefer_context=True, state_messages=state_messages + ) + + assert reconciled == sidecar_context + [ + {"role": "user", "content": "continue", "timestamp": 300.0}, + ] + + +def test_prefer_context_reconcile_keeps_state_delta_when_no_mirrored_prefix(): + sidecar_context = [ + {"role": "user", "content": "summary"}, + {"role": "assistant", "content": "saved answer"}, + ] + state_messages = [ + {"role": "user", "content": "fresh question", "timestamp": 300.0}, + {"role": "assistant", "content": "fresh answer", "timestamp": 301.0}, + ] + session = SimpleNamespace( + session_id="fresh-delta", + context_messages=sidecar_context, + messages=[], + ) + + reconciled = reconciled_state_db_messages_for_session( + session, prefer_context=True, state_messages=state_messages + ) + + assert reconciled == sidecar_context + state_messages + + +def test_prefer_context_reconcile_strips_mirrored_rows_without_sidecar_timestamps(): + sidecar_context = [ + {"role": "assistant", "content": "cron banner"}, + {"role": "user", "content": "summary"}, + {"role": "assistant", "content": "older answer"}, + {"role": "user", "content": "already saved"}, + ] + state_messages = [ + {"role": "assistant", "content": "cron banner", "timestamp": 100.0}, + {"role": "user", "content": "summary", "timestamp": 101.0}, + {"role": "assistant", "content": "older answer", "timestamp": 102.0}, + {"role": "user", "content": "already saved", "timestamp": 500.0}, + {"role": "user", "content": "new after sidecar", "timestamp": 600.0}, + ] + session = SimpleNamespace( + session_id="untimestamped-context", + context_messages=sidecar_context, + messages=[], + ) + + reconciled = reconciled_state_db_messages_for_session( + session, prefer_context=True, state_messages=state_messages + ) + + assert reconciled == sidecar_context + [ + {"role": "user", "content": "new after sidecar", "timestamp": 600.0}, + ] + + +def test_prefer_context_reconcile_starts_after_last_state_row_seen_in_context(): + sidecar_context = [ + {"role": "assistant", "content": "cron banner"}, + {"role": "user", "content": "summary"}, + {"role": "assistant", "content": "old answer"}, + {"role": "assistant", "content": "later represented row"}, + ] + state_messages = [ + {"role": "assistant", "content": "cron banner", "timestamp": 100.0}, + {"role": "user", "content": "summary", "timestamp": 101.0}, + {"role": "assistant", "content": "old answer", "timestamp": 102.0}, + {"role": "tool", "content": "state-only stale tool", "timestamp": 103.0}, + {"role": "assistant", "content": "later represented row", "timestamp": 104.0}, + {"role": "user", "content": "new after represented boundary", "timestamp": 200.0}, + ] + session = SimpleNamespace( + session_id="represented-boundary", + context_messages=sidecar_context, + messages=[], + ) + + reconciled = reconciled_state_db_messages_for_session( + session, prefer_context=True, state_messages=state_messages + ) + + assert reconciled == sidecar_context + [ + {"role": "user", "content": "new after represented boundary", "timestamp": 200.0}, + ] + +def test_non_streaming_chat_writeback_dedupes_full_context_replay(): + previous_context = [ + {"role": "assistant", "content": "cron banner"}, + {"role": "user", "content": "[Session Arc Summary (d1, node 39)]\n" + "old context\n" * 400}, + {"role": "assistant", "content": "previous answer"}, + ] + result_messages = previous_context + previous_context + [ + {"role": "user", "content": "simple follow-up"}, + {"role": "assistant", "content": "short answer"}, + ] + + next_context = _dedupe_replayed_context_messages(previous_context, result_messages) + + assert next_context == previous_context + [ + {"role": "user", "content": "simple follow-up"}, + {"role": "assistant", "content": "short answer"}, + ] + def test_session_context_falls_back_to_display_messages_for_legacy_sessions(tmp_path): messages = [ {"role": "user", "content": "legacy prompt"}, From c616c8e78892bac658c338312414219828c4168b Mon Sep 17 00:00:00 2001 From: Lumen Yang Date: Thu, 21 May 2026 07:08:00 +0000 Subject: [PATCH 028/349] fix: cap live tool prompt estimates --- api/streaming.py | 50 ++++++++++++++++++-- pr-artifacts/context-replay-failure-cases.md | 17 +++++++ tests/test_streaming_live_usage_estimate.py | 22 +++++++++ 3 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 tests/test_streaming_live_usage_estimate.py diff --git a/api/streaming.py b/api/streaming.py index 35233482aa..5081d70ed4 100644 --- a/api/streaming.py +++ b/api/streaming.py @@ -2849,6 +2849,50 @@ def _assistant_reply_added_after_current_turn(result_messages, previous_context, _TOOL_RESULT_SNIPPET_MAX = 4000 +_LIVE_TOOL_PROMPT_DELTA_MAX = 12_000 + + +def _bounded_live_tool_prompt_delta(messages, *, cap: int = _LIVE_TOOL_PROMPT_DELTA_MAX) -> int: + """Return a bounded rough token delta for live tool metering. + + Tool-result callbacks can fire before the agent's next exact prompt accounting + is available. The live usage ring should show a conservative in-flight hint, + not replay a full large tool payload into `last_prompt_tokens`. + """ + if not messages: + return 0 + try: + from agent.model_metadata import estimate_messages_tokens_rough + delta = int(estimate_messages_tokens_rough(messages) or 0) + except Exception: + delta = 0 + if delta <= 0: + return 0 + return min(delta, int(cap or 0)) + + +def live_usage_prompt_estimate_after_tool_delta( + *, + base_prompt_tokens: int, + exact_prompt_tokens: int = 0, + messages=None, + cap: int = _LIVE_TOOL_PROMPT_DELTA_MAX, +) -> dict: + """Compute the live `last_prompt_tokens` estimate after a tool update. + + Exact compressor/provider prompt accounting wins. When no newer exact prompt + is available, add only a bounded live tool delta to the persisted base. + """ + base = int(base_prompt_tokens or 0) + exact = int(exact_prompt_tokens or 0) + if exact and exact != base: + return {'last_prompt_tokens': exact, 'estimated': False} + return { + 'last_prompt_tokens': base + _bounded_live_tool_prompt_delta(messages, cap=cap), + 'estimated': True, + } + + def _tool_result_snippet(raw, limit: int = _TOOL_RESULT_SNIPPET_MAX) -> str: """Extract a bounded result preview from a stored tool message payload.""" if limit <= 0: @@ -3380,11 +3424,7 @@ def _bump_live_prompt_estimate(messages) -> int: """Increment a rough next-prompt estimate from live tool activity.""" if not messages: return _live_prompt_estimate_tokens[0] - try: - from agent.model_metadata import estimate_messages_tokens_rough - _delta = int(estimate_messages_tokens_rough(messages) or 0) - except Exception: - _delta = 0 + _delta = _bounded_live_tool_prompt_delta(messages) if _delta > 0: _seed_live_prompt_estimate() _live_prompt_estimate_tokens[0] += _delta diff --git a/pr-artifacts/context-replay-failure-cases.md b/pr-artifacts/context-replay-failure-cases.md index 3901a45963..46a9a72cef 100644 --- a/pr-artifacts/context-replay-failure-cases.md +++ b/pr-artifacts/context-replay-failure-cases.md @@ -141,3 +141,20 @@ Key invariant for upstream: If context_messages exists, it is the authoritative model-facing prefix. State/db/display histories may be fuller/noisier and should only contribute messages that are demonstrably newer than that prefix. ``` + + +## F. Live metering over-counts large in-flight tool results after cancel/retry + +Observed after deploying the reconciliation fix and retrying `continue` in session `20260521_060755_294aed`: + +```text +persisted sidecar context: 69 messages, ~49,993 rough content tokens +state.db messages: 90 messages +state delta after context: 21 messages, ~21,226 rough content tokens +turn-start context after fix: 90 messages, ~71,219 rough content tokens +last_prompt_tokens persisted: 86,723 (~33.9%) +``` + +The previous full-transcript turn-start replay was gone, but the ring still jumped during the run. The new jump came from live metering, not persisted context reconciliation. The run executed several large `read_file` tool calls (5k / 17k / 13k chars). `_record_live_tool_complete()` fed each bounded preview into `_bump_live_prompt_estimate()`, which added the full rough tool-result tokens to `last_prompt_tokens` before any exact next-prompt accounting was available. Repeated cancel/retry makes this look like context replay even when final sidecar context remains clean. + +Regression target: live tool metering should be a conservative UI hint and must not inflate `last_prompt_tokens` by the full content of large in-flight tool results. Exact provider/compressor prompt accounting should still win when available. diff --git a/tests/test_streaming_live_usage_estimate.py b/tests/test_streaming_live_usage_estimate.py new file mode 100644 index 0000000000..57d87c08a2 --- /dev/null +++ b/tests/test_streaming_live_usage_estimate.py @@ -0,0 +1,22 @@ +from api.streaming import live_usage_prompt_estimate_after_tool_delta + + +def test_live_usage_estimate_caps_tool_delta_against_previous_prompt(): + usage = live_usage_prompt_estimate_after_tool_delta( + base_prompt_tokens=86_723, + exact_prompt_tokens=86_723, + messages=[{"role": "tool", "content": "x" * 80_000}], + ) + + assert usage["last_prompt_tokens"] <= 86_723 + 12_000 + assert usage["last_prompt_tokens"] < 120_000 + + +def test_live_usage_estimate_preserves_real_prompt_when_exact_prompt_advances(): + usage = live_usage_prompt_estimate_after_tool_delta( + base_prompt_tokens=86_723, + exact_prompt_tokens=136_000, + messages=[{"role": "tool", "content": "x" * 80_000}], + ) + + assert usage["last_prompt_tokens"] == 136_000 From 3740df5302b84ff82a91722bdfa57e267f5b99d5 Mon Sep 17 00:00:00 2001 From: Lumen Yang Date: Thu, 21 May 2026 07:57:13 +0000 Subject: [PATCH 029/349] docs: add context replay PR body --- pr-artifacts/pr-body-summary-replay-dedupe.md | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 pr-artifacts/pr-body-summary-replay-dedupe.md diff --git a/pr-artifacts/pr-body-summary-replay-dedupe.md b/pr-artifacts/pr-body-summary-replay-dedupe.md new file mode 100644 index 0000000000..f43e61b84b --- /dev/null +++ b/pr-artifacts/pr-body-summary-replay-dedupe.md @@ -0,0 +1,83 @@ +## Summary + +Follow-up to #2651. That PR fixed one replay boundary, but continued testing exposed the same context-invariant violation at additional WebUI merge/metering boundaries. + +This PR makes the replay protection context-engine agnostic: + +- strips replayed non-adjacent context blocks and near-duplicate large Session Arc Summary cards before writing model context +- applies the same replay guard to the non-streaming `/api/chat` writeback path +- treats `context_messages` as the authoritative model-facing prefix when reconciling sidecar state with `state.db`, appending only demonstrably new state rows +- caps live tool-result prompt estimates so the context ring does not treat large in-flight tool outputs as exact prompt growth + +LCM/continuation made these failures easy to reproduce, but the invariant is broader than LCM: + +> If `context_messages` exists, it is the authoritative model-facing prefix. `messages`/`state.db` may be fuller or noisier histories and should only contribute true deltas. Live usage estimates must not override exact prompt accounting. + +## Why this happens + +WebUI currently merges several histories that have different meanings: + +- `context_messages`: compact model-facing context for the next call +- `messages`: visible display transcript +- `state.db`: append-only runtime/session journal, including tool rows + +After compression/continuation, those sources can overlap. The old code sometimes treated append candidates as wholly new: + +```text +clean context_messages + whole state.db transcript +``` + +or: + +```text +previous_context + replayed_tail + new_delta +``` + +That reintroduced old summaries, tool rows, or active-tail messages into the next model context or into the live usage estimate. + +## Failure cases covered + +The detailed debugging artifact is in `pr-artifacts/context-replay-failure-cases.md`. The key cases are: + +1. **Compression continuation replays the active tail** + - `result_messages` can contain `previous_context + replayed_tail + new_delta`. + - Prefix slicing alone saves the replayed tail again. + +2. **Near-duplicate large Session Arc Summary cards** + - Large `[Session Arc Summary ...]` messages can share a huge prefix while differing in refreshed tails/hints. + - Exact-match dedupe misses them. + +3. **Non-adjacent replay blocks** + - Replayed blocks can be separated by compression markers/summaries/tool rows, so adjacent-only dedupe is insufficient. + +4. **Non-streaming `/api/chat` writeback missed the replay guard** + - The streaming path deduped context writeback; synchronous chat restored reasoning metadata and saved directly. + +5. **Turn-start state reconciliation polluted a clean sidecar context** + - With `prefer_context=True`, a clean sidecar context could still be followed by mirrored `state.db` transcript rows. + - The next runtime prompt grew even though persisted `context_messages` stayed compact. + +6. **Live metering over-counted large in-flight tool results** + - Tool callbacks can arrive before exact next-prompt accounting. + - The old live estimate added full rough tool-result tokens to `last_prompt_tokens`, causing context-ring jumps that disappeared after cancel/persisted refresh. + +## Implementation notes + +- `_dedupe_replayed_context_messages(...)` now handles non-adjacent replay blocks and large near-duplicate summary cards. +- `/api/chat` writeback calls the same context replay guard as streaming writeback. +- `state_db_delta_after_context(...)` uses `context_messages` as the authoritative prefix and only returns state rows after the last state row already represented by sidecar context. +- `_bounded_live_tool_prompt_delta(...)` bounds live-only tool estimate growth while preserving exact compressor/provider prompt accounting when available. + +## Test plan + +```bash +python -m pytest -q tests/test_streaming_live_usage_estimate.py tests/test_issue1217_transcript_compaction.py tests/test_session_save_mode.py +git diff --check +python -m compileall -q api/models.py api/streaming.py api/routes.py +``` + +Current local result: + +```text +43 passed +``` From 5934c2fe8a034a27565e90f4769e548a716320c0 Mon Sep 17 00:00:00 2001 From: Lumen Yang Date: Fri, 22 May 2026 09:48:28 +0000 Subject: [PATCH 030/349] fix: address context replay review feedback --- api/routes.py | 5 + api/streaming.py | 3 +- tests/test_issue1217_transcript_compaction.py | 121 +++++++++++++++++- 3 files changed, 127 insertions(+), 2 deletions(-) diff --git a/api/routes.py b/api/routes.py index fe789dea55..97db1f2e95 100644 --- a/api/routes.py +++ b/api/routes.py @@ -9079,6 +9079,7 @@ def _handle_chat_sync(handler, body): session_id=s.session_id, ) from api.streaming import ( + _dedupe_replayed_context_messages, _merge_display_messages_after_agent_result, _restore_display_reasoning_metadata, _restore_reasoning_metadata, @@ -9129,6 +9130,10 @@ def _handle_chat_sync(handler, body): _previous_context_messages, _result_messages, ) + _next_context_messages = _dedupe_replayed_context_messages( + _previous_context_messages, + _next_context_messages, + ) s.context_messages = _next_context_messages s.messages = _merge_display_messages_after_agent_result( _previous_messages, diff --git a/api/streaming.py b/api/streaming.py index 5081d70ed4..70a0a87d58 100644 --- a/api/streaming.py +++ b/api/streaming.py @@ -2469,7 +2469,8 @@ def _dedupe_replayed_context_messages(previous_context, result_messages): return result_messages candidates = result_messages[len(previous_context):] candidates = _strip_replayed_prefix(previous_context, candidates) - candidates = _strip_replayed_context_items(previous_context, candidates) + if candidates: + candidates = _strip_replayed_context_items(previous_context, candidates) return previous_context + candidates diff --git a/tests/test_issue1217_transcript_compaction.py b/tests/test_issue1217_transcript_compaction.py index e45e9d1178..7b870d61ee 100644 --- a/tests/test_issue1217_transcript_compaction.py +++ b/tests/test_issue1217_transcript_compaction.py @@ -1,7 +1,11 @@ -from api.models import Session, reconciled_state_db_messages_for_session import contextlib +import io +import json +import sys from types import SimpleNamespace +from api.models import Session, reconciled_state_db_messages_for_session + from api.streaming import ( _assistant_reply_added_after_current_turn, _context_messages_for_new_turn, @@ -426,6 +430,31 @@ def test_prefer_context_reconcile_keeps_state_delta_when_no_mirrored_prefix(): assert reconciled == sidecar_context + state_messages +def test_prefer_context_reconcile_strips_small_mirrored_context_prefix(): + sidecar_context = [ + {"role": "user", "content": "[Session Arc Summary] compacted"}, + {"role": "assistant", "content": "last compacted answer"}, + ] + state_messages = [ + {"role": "user", "content": "[Session Arc Summary] compacted", "timestamp": 100.0}, + {"role": "assistant", "content": "last compacted answer", "timestamp": 101.0}, + {"role": "user", "content": "fresh follow-up", "timestamp": 200.0}, + ] + session = SimpleNamespace( + session_id="small-context-prefix", + context_messages=sidecar_context, + messages=[], + ) + + reconciled = reconciled_state_db_messages_for_session( + session, prefer_context=True, state_messages=state_messages + ) + + assert reconciled == sidecar_context + [ + {"role": "user", "content": "fresh follow-up", "timestamp": 200.0}, + ] + + def test_prefer_context_reconcile_strips_mirrored_rows_without_sidecar_timestamps(): sidecar_context = [ {"role": "assistant", "content": "cron banner"}, @@ -502,6 +531,96 @@ def test_non_streaming_chat_writeback_dedupes_full_context_replay(): {"role": "assistant", "content": "short answer"}, ] +class _FakePostHandler: + def __init__(self): + self.status = None + self.headers = {} + self.body = bytearray() + self.wfile = self + + def send_response(self, status): + self.status = status + + def send_header(self, name, value): + self.headers[name] = value + + def end_headers(self): + pass + + def write(self, data): + self.body.extend(data) + + def json_body(self): + return json.loads(bytes(self.body).decode("utf-8")) + + +def test_handle_chat_sync_writeback_dedupes_full_context_replay(tmp_path, monkeypatch): + import api.config as config + import api.models as models + import api.routes as routes + + state_dir = tmp_path / "state" + session_dir = state_dir / "sessions" + session_dir.mkdir(parents=True) + monkeypatch.setattr(models, "SESSION_DIR", session_dir) + monkeypatch.setattr(models, "SESSION_INDEX_FILE", state_dir / "session_index.json") + monkeypatch.setattr(routes, "SESSION_INDEX_FILE", state_dir / "session_index.json") + monkeypatch.setattr(routes, "get_session", models.get_session) + monkeypatch.setattr(routes, "title_from", models.title_from) + monkeypatch.setattr(config, "get_config", lambda: {"model": "test-model", "provider": "test-provider"}) + monkeypatch.setattr(routes, "get_config", lambda: {"model": "test-model", "provider": "test-provider"}) + monkeypatch.setattr(routes, "resolve_trusted_workspace", lambda value: tmp_path) + monkeypatch.setattr(routes, "load_settings", lambda: {}) + monkeypatch.setattr(routes, "_resolve_cli_toolsets", lambda: []) + + previous_context = [ + {"role": "assistant", "content": "cron banner"}, + {"role": "user", "content": "[Session Arc Summary (d1, node 39)]\n" + "old context\n" * 400}, + {"role": "assistant", "content": "previous answer"}, + ] + session = Session( + session_id="sync_chat_replay", + workspace=str(tmp_path), + messages=list(previous_context), + context_messages=list(previous_context), + model="test-model", + model_provider="test-provider", + ) + session.save(touch_updated_at=False) + + replayed_result = previous_context + previous_context + [ + {"role": "user", "content": "simple follow-up"}, + {"role": "assistant", "content": "short answer"}, + ] + + class FakeAgent: + def __init__(self, **_kwargs): + pass + + def run_conversation(self, **_kwargs): + return { + "messages": replayed_result, + "final_response": "short answer", + "completed": True, + } + + monkeypatch.setitem(sys.modules, "run_agent", SimpleNamespace(AIAgent=FakeAgent)) + + handler = _FakePostHandler() + routes._handle_chat_sync( + handler, + {"session_id": session.session_id, "message": "simple follow-up", "workspace": str(tmp_path)}, + ) + + assert handler.status == 200 + reloaded = Session.load(session.session_id) + assert reloaded.context_messages == previous_context + [ + {"role": "user", "content": "simple follow-up"}, + {"role": "assistant", "content": "short answer"}, + ] + assert reloaded.context_messages.count(previous_context[0]) == 1 + + def test_session_context_falls_back_to_display_messages_for_legacy_sessions(tmp_path): messages = [ {"role": "user", "content": "legacy prompt"}, From 32658978a970abea0eb863fd36a18b6ef6056281 Mon Sep 17 00:00:00 2001 From: Lumen Yang Date: Fri, 22 May 2026 09:49:21 +0000 Subject: [PATCH 031/349] docs: refresh context replay test count --- pr-artifacts/pr-body-summary-replay-dedupe.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pr-artifacts/pr-body-summary-replay-dedupe.md b/pr-artifacts/pr-body-summary-replay-dedupe.md index f43e61b84b..56a44007c2 100644 --- a/pr-artifacts/pr-body-summary-replay-dedupe.md +++ b/pr-artifacts/pr-body-summary-replay-dedupe.md @@ -79,5 +79,5 @@ python -m compileall -q api/models.py api/streaming.py api/routes.py Current local result: ```text -43 passed +45 passed ``` From d0992730a91ca6d4adee7391e0b57a7743074db4 Mon Sep 17 00:00:00 2001 From: Lumen Yang Date: Fri, 22 May 2026 21:58:59 +0000 Subject: [PATCH 032/349] fix: preserve repeated state rows in replay delta --- api/models.py | 28 +++++++++---------- tests/test_issue1217_transcript_compaction.py | 22 ++++++++++++++- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/api/models.py b/api/models.py index 909f3f61dc..fcd12ff5cb 100644 --- a/api/models.py +++ b/api/models.py @@ -3270,21 +3270,19 @@ def state_db_delta_after_context(sidecar_context: list, state_messages: list) -> if best_len < 2: return state_messages - sidecar_key_set = set(sidecar_keys) - last_represented_state_index = best_len - 1 - for idx, key in enumerate(state_keys[best_len:], start=best_len): - if key in sidecar_key_set: - last_represented_state_index = idx - - delta = [] - for msg, key in zip( - state_messages[last_represented_state_index + 1:], - state_keys[last_represented_state_index + 1:], - ): - if key in sidecar_key_set: - continue - delta.append(msg) - return delta + # Drop only rows that can be aligned with the remaining sidecar context in + # order. This still tolerates stale state-only rows between mirrored context + # rows, but once the sidecar context is exhausted every later state row is a + # real delta, even if it repeats a short earlier message. + sidecar_index = best_len + state_index = best_len + while sidecar_index < len(sidecar_keys) and state_index < len(state_keys): + if state_keys[state_index] == sidecar_keys[sidecar_index]: + sidecar_index += 1 + state_index += 1 + if sidecar_index == len(sidecar_keys): + return state_messages[state_index:] + return state_messages[best_len:] def merge_session_messages_append_only(sidecar_messages: list, state_messages: list) -> list: diff --git a/tests/test_issue1217_transcript_compaction.py b/tests/test_issue1217_transcript_compaction.py index 7b870d61ee..eced9261e5 100644 --- a/tests/test_issue1217_transcript_compaction.py +++ b/tests/test_issue1217_transcript_compaction.py @@ -4,7 +4,7 @@ import sys from types import SimpleNamespace -from api.models import Session, reconciled_state_db_messages_for_session +from api.models import Session, reconciled_state_db_messages_for_session, state_db_delta_after_context from api.streaming import ( _assistant_reply_added_after_current_turn, @@ -513,6 +513,26 @@ def test_prefer_context_reconcile_starts_after_last_state_row_seen_in_context(): {"role": "user", "content": "new after represented boundary", "timestamp": 200.0}, ] + + +def test_state_db_delta_preserves_fresh_rows_before_repeated_context_message(): + sidecar_context = [ + {"role": "user", "content": "ok"}, + {"role": "assistant", "content": "ready"}, + ] + state_messages = [ + {"role": "user", "content": "ok", "timestamp": 1.0}, + {"role": "assistant", "content": "ready", "timestamp": 2.0}, + {"role": "user", "content": "fresh question", "timestamp": 3.0}, + {"role": "user", "content": "ok", "timestamp": 4.0}, + {"role": "assistant", "content": "after repeat", "timestamp": 5.0}, + ] + + delta = state_db_delta_after_context(sidecar_context, state_messages) + + assert [m["content"] for m in delta] == ["fresh question", "ok", "after repeat"] + + def test_non_streaming_chat_writeback_dedupes_full_context_replay(): previous_context = [ {"role": "assistant", "content": "cron banner"}, From fe6558efac77f0fc86a44ed3456fed133a3ec7f0 Mon Sep 17 00:00:00 2001 From: nesquena-hermes <[email protected]> Date: Mon, 25 May 2026 00:10:39 +0000 Subject: [PATCH 033/349] Stage-batch14: drop pr-artifacts/ scratchpad from #2685 cherry-picks The contributor used pr-artifacts/ as a working scratchpad during PR development. The real test count and failure-mode docs are already covered by inline test comments and CHANGELOG entries; this directory adds nothing for upstream readers. --- pr-artifacts/context-replay-failure-cases.md | 160 ------------------ pr-artifacts/pr-body-summary-replay-dedupe.md | 83 --------- 2 files changed, 243 deletions(-) delete mode 100644 pr-artifacts/context-replay-failure-cases.md delete mode 100644 pr-artifacts/pr-body-summary-replay-dedupe.md diff --git a/pr-artifacts/context-replay-failure-cases.md b/pr-artifacts/context-replay-failure-cases.md deleted file mode 100644 index 46a9a72cef..0000000000 --- a/pr-artifacts/context-replay-failure-cases.md +++ /dev/null @@ -1,160 +0,0 @@ -# Context replay / progress-ring failure cases - -This artifact records concrete failure cases observed while debugging WebUI + LCM context replay. It is intended to support an upstream PR with reproducible rationale. - -## A. Compression continuation replays active tail into display/context - -Observed shape after compression/continuation: - -```text -previous_context = [summary, A, B, C] -result_messages = previous_context + [A, B, C, D] -old saved context/display = [summary, A, B, C, A, B, C, D] -expected = [summary, A, B, C, D] -``` - -Code-level cause: writeback assumed `result_messages[len(previous_context):]` was all new delta. After LCM/session rollover, the agent may replay the active tail after the compacted prefix, so this assumption is false. - -Regression target: strip candidate prefixes that are already suffixes of existing context/display. - -## B. Near-duplicate large Session Arc Summary cards - -Observed in WebUI sidecar display transcript for sessions in the `20260520_200424_a43cef` / `20260520_201320_a95eac` lineage: - -```text -[Session Arc Summary (d1, node 39)] ... 62k chars -[Session Arc Summary (d1, node 39)] ... 62k chars -[Session Arc Summary (d1, node 39)] ... 74k chars -``` - -These summaries shared thousands of identical prefix characters but differed in tails/expand hints. Exact identity checks missed them. One duplicated ~80k char summary explains a ~20k-token jump. - -Regression target: treat large `[Session Arc Summary ...]` messages with the same long prefix as replayed summary artifacts. - -## C. Non-adjacent replay blocks separated by markers/summaries - -Observed display transcript contained repeated blocks that were not immediately adjacent, e.g. best block lengths around 171 messages in historical `messages`: - -```text -A B C ... [compression marker / summary / unrelated rows] ... A B C -``` - -Adjacent-only dedupe falsely reported clean. This matters because LCM/continuation can insert compression cards, cron banners, or summary messages between original block and replayed tail. - -Regression target: detect and strip replayed non-adjacent blocks when appending model context candidates. - -## D. Non-streaming `/api/chat` writeback missed dedupe - -Observed session: `20260521_060755_294aed`. - -User asked a short question with no meaningful new tool usage: - -```text -这是一个内部服务对么？简答 -``` - -Before cleanup: - -```text -context_messages: 136 -best replay: 67 messages repeated from index 0 at index 67 -last_prompt_tokens: 136668 (~53.4% of 256k) -``` - -Expected shape was: - -```text -previous_context(67) + new_user + new_assistant = 69 messages -``` - -Actual cause: streaming writeback used `_dedupe_replayed_context_messages`, but synchronous `/api/chat` wrote `_restore_reasoning_metadata(previous_context, result_messages)` directly to `s.context_messages`. - -Regression target: both streaming and non-streaming writeback paths must use the same replay-dedupe guard. - -## E. Runtime/progress-ring jump: clean persisted context, polluted turn-start reconciliation - -Observed session: `20260521_060755_294aed` after cleanup and deployment. - -Persisted sidecar after pause/cancel: - -```text -context_messages: 69 -context chars: 199,972 -rough content tokens: ~49,993 -last_prompt_tokens: 86,723 (~33.9%) -``` - -But starting/continuing a streaming turn made the progress ring jump to ~55%. Simulating the turn-start code path showed: - -```text -ctx_before_agent: 154 messages -chars: 448,438 -rough content tokens: ~112,109 -``` - -After applying existing final-writeback dedupe to that runtime prompt: - -```text -after_current_dedupe: 85 messages -chars: 248,466 -rough content tokens: ~62,116 -``` - -So the ring was not randomly wrong: it reflected a polluted runtime prompt estimate. The persisted sidecar stayed clean because final writeback/cancel did not save the runtime replay. - -Code-level cause: streaming turn start does: - -```python -_previous_context_messages = _new_turn_context_from_messages( - reconciled_state_db_messages_for_session( - s, - prefer_context=True, - state_messages=_external_state_messages, - ), - msg_text, -) -``` - -When `prefer_context=True`, sidecar `context_messages` are clean, but `state.db` still contains mirrored/replayed transcript rows. `reconciled_state_db_messages_for_session` append-only merges `context_messages + whole state transcript`, so the agent/runtime prompt temporarily receives old transcript rows again. - -Regression target: when `prefer_context=True` and sidecar `context_messages` exists, reconciliation must return: - -```text -clean sidecar context + truly newer state.db delta -``` - -not: - -```text -clean sidecar context + full state.db transcript -``` - -## PR thesis - -The bug family is not a model behavior issue. It is a WebUI persistence/reconciliation invariant violation: - -> Model-facing context is append-only, but append candidates may contain replayed context due to LCM/session continuation/state-db mirroring. Every boundary that merges result/state messages into model context must strip replayed prefixes/blocks and must distinguish clean sidecar context from full display/state transcripts. - -Key invariant for upstream: - -```text -If context_messages exists, it is the authoritative model-facing prefix. -State/db/display histories may be fuller/noisier and should only contribute messages that are demonstrably newer than that prefix. -``` - - -## F. Live metering over-counts large in-flight tool results after cancel/retry - -Observed after deploying the reconciliation fix and retrying `continue` in session `20260521_060755_294aed`: - -```text -persisted sidecar context: 69 messages, ~49,993 rough content tokens -state.db messages: 90 messages -state delta after context: 21 messages, ~21,226 rough content tokens -turn-start context after fix: 90 messages, ~71,219 rough content tokens -last_prompt_tokens persisted: 86,723 (~33.9%) -``` - -The previous full-transcript turn-start replay was gone, but the ring still jumped during the run. The new jump came from live metering, not persisted context reconciliation. The run executed several large `read_file` tool calls (5k / 17k / 13k chars). `_record_live_tool_complete()` fed each bounded preview into `_bump_live_prompt_estimate()`, which added the full rough tool-result tokens to `last_prompt_tokens` before any exact next-prompt accounting was available. Repeated cancel/retry makes this look like context replay even when final sidecar context remains clean. - -Regression target: live tool metering should be a conservative UI hint and must not inflate `last_prompt_tokens` by the full content of large in-flight tool results. Exact provider/compressor prompt accounting should still win when available. diff --git a/pr-artifacts/pr-body-summary-replay-dedupe.md b/pr-artifacts/pr-body-summary-replay-dedupe.md deleted file mode 100644 index 56a44007c2..0000000000 --- a/pr-artifacts/pr-body-summary-replay-dedupe.md +++ /dev/null @@ -1,83 +0,0 @@ -## Summary - -Follow-up to #2651. That PR fixed one replay boundary, but continued testing exposed the same context-invariant violation at additional WebUI merge/metering boundaries. - -This PR makes the replay protection context-engine agnostic: - -- strips replayed non-adjacent context blocks and near-duplicate large Session Arc Summary cards before writing model context -- applies the same replay guard to the non-streaming `/api/chat` writeback path -- treats `context_messages` as the authoritative model-facing prefix when reconciling sidecar state with `state.db`, appending only demonstrably new state rows -- caps live tool-result prompt estimates so the context ring does not treat large in-flight tool outputs as exact prompt growth - -LCM/continuation made these failures easy to reproduce, but the invariant is broader than LCM: - -> If `context_messages` exists, it is the authoritative model-facing prefix. `messages`/`state.db` may be fuller or noisier histories and should only contribute true deltas. Live usage estimates must not override exact prompt accounting. - -## Why this happens - -WebUI currently merges several histories that have different meanings: - -- `context_messages`: compact model-facing context for the next call -- `messages`: visible display transcript -- `state.db`: append-only runtime/session journal, including tool rows - -After compression/continuation, those sources can overlap. The old code sometimes treated append candidates as wholly new: - -```text -clean context_messages + whole state.db transcript -``` - -or: - -```text -previous_context + replayed_tail + new_delta -``` - -That reintroduced old summaries, tool rows, or active-tail messages into the next model context or into the live usage estimate. - -## Failure cases covered - -The detailed debugging artifact is in `pr-artifacts/context-replay-failure-cases.md`. The key cases are: - -1. **Compression continuation replays the active tail** - - `result_messages` can contain `previous_context + replayed_tail + new_delta`. - - Prefix slicing alone saves the replayed tail again. - -2. **Near-duplicate large Session Arc Summary cards** - - Large `[Session Arc Summary ...]` messages can share a huge prefix while differing in refreshed tails/hints. - - Exact-match dedupe misses them. - -3. **Non-adjacent replay blocks** - - Replayed blocks can be separated by compression markers/summaries/tool rows, so adjacent-only dedupe is insufficient. - -4. **Non-streaming `/api/chat` writeback missed the replay guard** - - The streaming path deduped context writeback; synchronous chat restored reasoning metadata and saved directly. - -5. **Turn-start state reconciliation polluted a clean sidecar context** - - With `prefer_context=True`, a clean sidecar context could still be followed by mirrored `state.db` transcript rows. - - The next runtime prompt grew even though persisted `context_messages` stayed compact. - -6. **Live metering over-counted large in-flight tool results** - - Tool callbacks can arrive before exact next-prompt accounting. - - The old live estimate added full rough tool-result tokens to `last_prompt_tokens`, causing context-ring jumps that disappeared after cancel/persisted refresh. - -## Implementation notes - -- `_dedupe_replayed_context_messages(...)` now handles non-adjacent replay blocks and large near-duplicate summary cards. -- `/api/chat` writeback calls the same context replay guard as streaming writeback. -- `state_db_delta_after_context(...)` uses `context_messages` as the authoritative prefix and only returns state rows after the last state row already represented by sidecar context. -- `_bounded_live_tool_prompt_delta(...)` bounds live-only tool estimate growth while preserving exact compressor/provider prompt accounting when available. - -## Test plan - -```bash -python -m pytest -q tests/test_streaming_live_usage_estimate.py tests/test_issue1217_transcript_compaction.py tests/test_session_save_mode.py -git diff --check -python -m compileall -q api/models.py api/streaming.py api/routes.py -``` - -Current local result: - -```text -45 passed -``` From 39121650d4a7c5ca233410df059275831fc8b70e Mon Sep 17 00:00:00 2001 From: gavinssr Date: Sun, 24 May 2026 15:34:26 +0800 Subject: [PATCH 034/349] feat: add shutdown button to WebUI title bar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a power button (⏻) in the title bar that gracefully stops the WebUI server process from the browser. - api/routes.py: POST /api/shutdown endpoint with threaded os._exit(0) - static/boot.js: shutdownServer() with confirm prompt, BroadcastChannel cross-tab notification, and _showServerStopped() placeholder UI - static/index.html: shutdown button HTML in title bar (after reload btn) - static/style.css: .app-titlebar-shutdown styles, hover turns red --- api/routes.py | 16 ++++++++++++++++ static/boot.js | 22 ++++++++++++++++++++++ static/index.html | 6 ++++++ static/style.css | 2 ++ 4 files changed, 46 insertions(+) diff --git a/api/routes.py b/api/routes.py index 97db1f2e95..67683be8fb 100644 --- a/api/routes.py +++ b/api/routes.py @@ -3628,6 +3628,20 @@ def _serve_shell_unavailable(handler, exc: Exception) -> bool: return True +def _handle_shutdown(handler) -> bool: + """Shut down the WebUI server process.""" + j(handler, {"status": "shutting_down"}) + import threading + + def _do_shutdown(): + import time + time.sleep(0.3) + os._exit(0) + + threading.Thread(target=_do_shutdown, daemon=True).start() + return True + + def _serve_manifest(handler) -> bool: """Serve static/manifest.json with the correct PWA Content-Type. @@ -4816,6 +4830,8 @@ def handle_post(handler, parsed) -> bool: finally: if diag: diag.finish() + if parsed.path == "/api/shutdown": + return _handle_shutdown(handler) # CSRF: reject cross-origin or tokenless authenticated browser requests. # /api/auth/login has no authenticated session token yet, and /api/csp-report # is intentionally unauthenticated for browser-generated violation reports. diff --git a/static/boot.js b/static/boot.js index e32d11d3b7..a16480e783 100644 --- a/static/boot.js +++ b/static/boot.js @@ -1,3 +1,13 @@ +(function(){ + // Clear stale stop-server flag on successful page load (server is reachable) + localStorage.removeItem('hermes-webui-server-stopped'); + // Listen for shutdown broadcast from other tabs + try { + var _stopChan = new BroadcastChannel('hermes-webui-shutdown'); + _stopChan.onmessage = function() { _showServerStopped(); }; + } catch(_) {} +})(); + async function cancelStream(){ const streamId = S.activeStreamId; if(!streamId) return; @@ -1860,3 +1870,15 @@ window.addEventListener('pageshow', async (event) => { } catch (_) {} } }); + +async function shutdownServer() { + if (!confirm('Stop the Hermes WebUI server?')) return; + localStorage.setItem('hermes-webui-server-stopped', '1'); + try { var bc = new BroadcastChannel('hermes-webui-shutdown'); bc.postMessage('stop'); bc.close(); } catch(_) {} + _showServerStopped(); + try { await fetch('/api/shutdown', { method: 'POST' }); } catch (_) {} +} + +function _showServerStopped() { + document.body.innerHTML = '

Server stopped. You can close this tab.

'; +} diff --git a/static/index.html b/static/index.html index 722d38f78e..23e469b5ce 100644 --- a/static/index.html +++ b/static/index.html @@ -146,6 +146,12 @@ +
diff --git a/static/sessions.js b/static/sessions.js index 4d778d3a15..e14d19529e 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -2666,9 +2666,29 @@ function _sessionSearchContentPreview(session, query){ return preview||''; } +function syncSessionSearchClear(){ + const input=$('sessionSearch'); + const clear=$('sessionSearchClear'); + if(!input||!clear) return; + clear.hidden=!Boolean(input.value); +} + +function clearSessionSearch(focusInput=true){ + const input=$('sessionSearch'); + if(!input) return; + if(input.value){ + input.value=''; + filterSessions(); + }else{ + syncSessionSearchClear(); + } + if(focusInput) input.focus(); +} + function filterSessions(){ // Immediate client-side title filter (no flicker) // Debounced content search via API for message text + syncSessionSearchClear(); const q = ($('sessionSearch').value || '').trim(); if(q!==_lastSessionSearchQuery){ _lastSessionSearchQuery=q; diff --git a/static/style.css b/static/style.css index d932d8f3ed..95eb620da6 100644 --- a/static/style.css +++ b/static/style.css @@ -701,11 +701,18 @@ .new-chat-btn{width:100%;padding:9px 12px;border-radius:9px;background:var(--accent-bg);border:1px solid var(--accent-bg-strong);color:var(--accent-text);font-size:13px;cursor:pointer;display:flex;align-items:center;gap:8px;transition:all .15s;margin-bottom:8px;font-weight:500;} .new-chat-btn:hover{background:var(--accent-bg-strong);border-color:var(--accent);} .session-list{flex:1;overflow-y:auto;padding:0 8px 8px;min-height:0;overscroll-behavior-y:contain;touch-action:pan-y;overflow-anchor:none;} - .sidebar-search{position:relative;padding:8px 12px;flex-shrink:0;} + .sidebar-search{padding:8px 12px;flex-shrink:0;} + .session-search-field{position:relative;display:flex;align-items:center;width:100%;} .sidebar-search input{width:100%;background:var(--bg);border:1px solid var(--border);border-radius:8px;color:var(--text);padding:7px 10px 7px 32px;font-size:13px;outline:none;transition:border-color .15s,box-shadow .15s,background .15s;box-sizing:border-box;} + .session-search input{padding-right:34px;} .sidebar-search input:focus{border-color:var(--accent);box-shadow:0 0 0 3px var(--accent-bg);} .sidebar-search input::placeholder{color:var(--muted);opacity:.7;} - .sidebar-search-icon{position:absolute;left:22px;top:50%;transform:translateY(-50%);width:14px;height:14px;color:var(--muted);opacity:.7;pointer-events:none;} + .sidebar-search-icon{position:absolute;left:10px;top:50%;transform:translateY(-50%);width:14px;height:14px;color:var(--muted);opacity:.7;pointer-events:none;} + .session-search .session-search-clear{position:absolute;right:6px;top:50%;transform:translateY(-50%);z-index:1;width:24px;height:24px;border:0;border-radius:6px;background:transparent;color:var(--muted);display:flex;align-items:center;justify-content:center;padding:0;cursor:pointer;opacity:.78;} + .session-search-clear[hidden]{display:none;} + .session-search-clear svg{width:14px;height:14px;} + .session-search-clear:hover,.session-search-clear:focus-visible{background:var(--hover);color:var(--text);opacity:1;} + .session-search-clear:focus-visible{outline:2px solid var(--accent);outline-offset:1px;} /* Inline session title edit */ .session-title-input{flex:1;background:var(--surface);border:1px solid var(--accent);border-radius:6px;color:var(--text);padding:3px 8px;font-size:13px;outline:none;min-width:0;box-shadow:0 0 0 2px var(--accent-bg-strong);font-family:inherit;} /* padding-right was 86px to reserve space for the absolute-positioned diff --git a/tests/test_sidebar_search_highlights.py b/tests/test_sidebar_search_highlights.py index 47cd44c122..c65838d84e 100644 --- a/tests/test_sidebar_search_highlights.py +++ b/tests/test_sidebar_search_highlights.py @@ -7,6 +7,7 @@ ROOT = Path(__file__).resolve().parent.parent SESSIONS_JS = ROOT / "static" / "sessions.js" STYLE_CSS = ROOT / "static" / "style.css" +INDEX_HTML = ROOT / "static" / "index.html" def _run_js_ranges(cases): @@ -85,3 +86,63 @@ def test_sidebar_search_rendering_uses_safe_dom_helpers(): assert "if(($('sessionSearch').value||'').trim()) _hideSearchPreviewsAfterSelect=true;" in src assert ".session-search-preview" in css assert "-webkit-line-clamp:2" in css + + +def test_session_search_has_accessible_clear_button(): + html = INDEX_HTML.read_text(encoding="utf-8") + assert '
' in html + clear = re.search(r']*id="sessionSearchClear"[^>]*>', html) + assert clear, "#sessionSearchClear button not found beside #sessionSearch" + tag = clear.group(0) + assert 'type="button"' in tag + assert 'hidden' in tag + assert 'onclick="clearSessionSearch()"' in tag + assert 'aria-label="Clear conversation filter"' in tag + + +def test_session_search_clear_button_styles_do_not_shift_input_width(): + css = STYLE_CSS.read_text(encoding="utf-8") + assert ".session-search-field{position:relative;display:flex;align-items:center;width:100%;}" in css + assert ".session-search input{padding-right:34px;}" in css + assert ".sidebar-search-icon{position:absolute;left:10px;top:50%;transform:translateY(-50%);" in css + assert ".session-search .session-search-clear{position:absolute;" in css + assert "right:6px;top:50%;transform:translateY(-50%)" in css + assert "z-index:1" in css + assert ".session-search-clear[hidden]{display:none;}" in css + assert ".session-search-clear:focus-visible" in css + + +def test_session_search_clear_sync_and_click_behaviour(): + src = SESSIONS_JS.read_text(encoding="utf-8") + start = src.index("function syncSessionSearchClear") + end = src.index("function filterSessions", start) + helper = src[start:end] + script = helper + r""" +const input = { value: 'Psalm', focused: false, focus(){ this.focused = true; } }; +const clear = { hidden: true }; +let filtered = 0; +function $(id){ return id === 'sessionSearch' ? input : clear; } +function filterSessions(){ filtered += 1; syncSessionSearchClear(); } +syncSessionSearchClear(); +const visibleAfterText = clear.hidden === false; +clearSessionSearch(); +const clearedOnClick = input.value === '' && clear.hidden === true && filtered === 1 && input.focused === true; +input.value = 'again'; +input.focused = false; +clearSessionSearch(false); +const preserveFocus = input.value === '' && clear.hidden === true && filtered === 2 && input.focused === false; +console.log(JSON.stringify({visibleAfterText, clearedOnClick, preserveFocus})); +""" + completed = subprocess.run( + ["node", "-e", script], + check=True, + text=True, + capture_output=True, + cwd=ROOT, + ) + result = json.loads(completed.stdout) + assert result == { + "visibleAfterText": True, + "clearedOnClick": True, + "preserveFocus": True, + } From 28498aa98801afe8dc64e8e53eac5fb513a69ca3 Mon Sep 17 00:00:00 2001 From: george-andraws <96165956+george-andraws@users.noreply.github.com> Date: Thu, 28 May 2026 09:37:06 -0700 Subject: [PATCH 258/349] fix: scope conversation filter clear search CSS --- static/style.css | 5 +++-- tests/test_sidebar_search_highlights.py | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/static/style.css b/static/style.css index 95eb620da6..15b6650ba5 100644 --- a/static/style.css +++ b/static/style.css @@ -701,13 +701,14 @@ .new-chat-btn{width:100%;padding:9px 12px;border-radius:9px;background:var(--accent-bg);border:1px solid var(--accent-bg-strong);color:var(--accent-text);font-size:13px;cursor:pointer;display:flex;align-items:center;gap:8px;transition:all .15s;margin-bottom:8px;font-weight:500;} .new-chat-btn:hover{background:var(--accent-bg-strong);border-color:var(--accent);} .session-list{flex:1;overflow-y:auto;padding:0 8px 8px;min-height:0;overscroll-behavior-y:contain;touch-action:pan-y;overflow-anchor:none;} - .sidebar-search{padding:8px 12px;flex-shrink:0;} + .sidebar-search{position:relative;padding:8px 12px;flex-shrink:0;} .session-search-field{position:relative;display:flex;align-items:center;width:100%;} .sidebar-search input{width:100%;background:var(--bg);border:1px solid var(--border);border-radius:8px;color:var(--text);padding:7px 10px 7px 32px;font-size:13px;outline:none;transition:border-color .15s,box-shadow .15s,background .15s;box-sizing:border-box;} .session-search input{padding-right:34px;} .sidebar-search input:focus{border-color:var(--accent);box-shadow:0 0 0 3px var(--accent-bg);} .sidebar-search input::placeholder{color:var(--muted);opacity:.7;} - .sidebar-search-icon{position:absolute;left:10px;top:50%;transform:translateY(-50%);width:14px;height:14px;color:var(--muted);opacity:.7;pointer-events:none;} + .sidebar-search-icon{position:absolute;left:22px;top:50%;transform:translateY(-50%);width:14px;height:14px;color:var(--muted);opacity:.7;pointer-events:none;} + .session-search .sidebar-search-icon{left:10px;} .session-search .session-search-clear{position:absolute;right:6px;top:50%;transform:translateY(-50%);z-index:1;width:24px;height:24px;border:0;border-radius:6px;background:transparent;color:var(--muted);display:flex;align-items:center;justify-content:center;padding:0;cursor:pointer;opacity:.78;} .session-search-clear[hidden]{display:none;} .session-search-clear svg{width:14px;height:14px;} diff --git a/tests/test_sidebar_search_highlights.py b/tests/test_sidebar_search_highlights.py index c65838d84e..1c3bdd6a7b 100644 --- a/tests/test_sidebar_search_highlights.py +++ b/tests/test_sidebar_search_highlights.py @@ -102,9 +102,11 @@ def test_session_search_has_accessible_clear_button(): def test_session_search_clear_button_styles_do_not_shift_input_width(): css = STYLE_CSS.read_text(encoding="utf-8") + assert ".sidebar-search{position:relative;padding:8px 12px;flex-shrink:0;}" in css assert ".session-search-field{position:relative;display:flex;align-items:center;width:100%;}" in css assert ".session-search input{padding-right:34px;}" in css - assert ".sidebar-search-icon{position:absolute;left:10px;top:50%;transform:translateY(-50%);" in css + assert ".sidebar-search-icon{position:absolute;left:22px;top:50%;transform:translateY(-50%);" in css + assert ".session-search .sidebar-search-icon{left:10px;}" in css assert ".session-search .session-search-clear{position:absolute;" in css assert "right:6px;top:50%;transform:translateY(-50%)" in css assert "z-index:1" in css From e0c27174b344aed3df58ab94deb128b65c0392bc Mon Sep 17 00:00:00 2001 From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com> Date: Thu, 28 May 2026 20:30:33 +0200 Subject: [PATCH 259/349] test: cover code-only title language fallback --- tests/test_title_aux_routing.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/test_title_aux_routing.py b/tests/test_title_aux_routing.py index d10079242e..816314f512 100644 --- a/tests/test_title_aux_routing.py +++ b/tests/test_title_aux_routing.py @@ -305,6 +305,16 @@ def test_german_fallback_uses_generic_topic_extraction_without_literal_override( self.assertNotEqual(title, 'Session Bilder') self.assertIn('Warum', title) + def test_code_only_first_message_does_not_trigger_german_language_guard(self): + """Code-only starts should fall through to the neutral/default title path.""" + from api.streaming import _detect_title_language, _title_language_mismatch, _title_prompt_language_rule + + code_only = "print('hello')\nfor i in range(3):\n print(i)" + + self.assertEqual(_detect_title_language(code_only), '') + self.assertEqual(_title_prompt_language_rule(code_only), 'Match the language of the user question.\n') + self.assertFalse(_title_language_mismatch(code_only, 'Python Hello Loop')) + def test_configured_api_key_is_not_sent_to_caller_supplied_route(self): """Regression: title task keys must not leak to explicit fallback routes. From ed12948301c46bb62aeffec7773fece24f224ac1 Mon Sep 17 00:00:00 2001 From: nesquena-hermes <[email protected]> Date: Sat, 30 May 2026 01:06:24 +0000 Subject: [PATCH 260/349] stage-batch44: CHANGELOG for v0.51.162 (Release EH) --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9035a05ec..fdff913d6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## [Unreleased] +## [v0.51.162] — 2026-05-30 — Release EH (stage-batch44 — conversation-filter clear button + code-only title-language regression coverage) + ### Added - Conversation filtering now shows a clear button inside the search field whenever text is present, letting users clear the filter with one click. From da9211bf439054a7a603174c7694ca3a9d3a097a Mon Sep 17 00:00:00 2001 From: AlexeyDsov Date: Thu, 28 May 2026 18:31:39 +0300 Subject: [PATCH 261/349] fix(session): copy all critical fields on duplicate and branch to prevent state loss --- api/routes.py | 32 ++ tests/test_session_duplicate_edit.py | 208 +++++++++++ tests/test_session_duplicate_fields.py | 467 +++++++++++++++++++++++++ 3 files changed, 707 insertions(+) create mode 100644 tests/test_session_duplicate_edit.py create mode 100644 tests/test_session_duplicate_fields.py diff --git a/api/routes.py b/api/routes.py index e03ec1b9a7..a559f65fd5 100644 --- a/api/routes.py +++ b/api/routes.py @@ -5366,6 +5366,8 @@ def handle_post(handler, parsed) -> bool: input_tokens=session.input_tokens, output_tokens=session.output_tokens, estimated_cost=session.estimated_cost, + cache_read_tokens=getattr(session, "cache_read_tokens", 0), + cache_write_tokens=getattr(session, "cache_write_tokens", 0), # Per-session settings the user may have customized — carry them over # so the duplicate behaves identically until further edits. Compression # anchor + last_prompt_tokens are intentionally NOT carried — those @@ -5374,6 +5376,23 @@ def handle_post(handler, parsed) -> bool: enabled_toolsets=getattr(session, "enabled_toolsets", None), context_length=getattr(session, "context_length", None), threshold_tokens=getattr(session, "threshold_tokens", None), + truncation_watermark=getattr(session, "truncation_watermark", None), + # context_messages is the authoritative model-facing prefix — must be + # deepcopied so the duplicate has its own independent context that won't + # be mutated when the original session's context changes (#2914). + context_messages=copy.deepcopy(getattr(session, "context_messages", None) or []), + # Gateway routing — if the user customized routing for this session, + # the duplicate should behave identically. + gateway_routing=copy.deepcopy(getattr(session, "gateway_routing", None)), + gateway_routing_history=copy.deepcopy(getattr(session, "gateway_routing_history", None) or []), + # Preserve LLM-generated title flag so we don't regenerate title on duplicate. + llm_title_generated=getattr(session, "llm_title_generated", False), + # Composer draft — preserve per-session draft state. + composer_draft=copy.deepcopy(getattr(session, "composer_draft", None) or {}), + # Context engine state — preserve so the duplicate's context engine + # starts from the same point as the original. + context_engine=getattr(session, "context_engine", None), + context_engine_state=copy.deepcopy(getattr(session, "context_engine_state", None) or {}), created_at=time.time(), updated_at=time.time(), ) @@ -5875,9 +5894,22 @@ def handle_post(handler, parsed) -> bool: branch = Session( workspace=source.workspace, model=source.model, + model_provider=getattr(source, "model_provider", None), profile=getattr(source, "profile", None), title=branch_title, messages=forked_messages, + project_id=getattr(source, "project_id", None), + personality=getattr(source, "personality", None), + enabled_toolsets=getattr(source, "enabled_toolsets", None), + context_length=getattr(source, "context_length", None), + threshold_tokens=getattr(source, "threshold_tokens", None), + # context_messages — deep copy so the branch has independent context + context_messages=copy.deepcopy(getattr(source, "context_messages", None) or []), + # Gateway routing — inherit from source + gateway_routing=copy.deepcopy(getattr(source, "gateway_routing", None)), + # Context engine — inherit state so branch's context engine starts correctly + context_engine=getattr(source, "context_engine", None), + context_engine_state=copy.deepcopy(getattr(source, "context_engine_state", None) or {}), parent_session_id=source.session_id, session_source="fork", ) diff --git a/tests/test_session_duplicate_edit.py b/tests/test_session_duplicate_edit.py new file mode 100644 index 0000000000..dcea64cb7c --- /dev/null +++ b/tests/test_session_duplicate_edit.py @@ -0,0 +1,208 @@ +"""Test for session duplicate + edit message bug (#2914). + +When a session is duplicated, truncation_watermark is not copied. +After editing a message (truncate + send) in the duplicated session, +the watermark is set based on the copied messages' timestamps. +On next load, merge with state.db may filter out messages incorrectly. +""" +import copy +import os +import tempfile +import threading +import time +import uuid + +import pytest + + +@pytest.fixture +def isolated_session_env(): + """Isolate session state for testing duplicate + edit scenario.""" + from api import config as _cfg + from api import models as _models + from pathlib import Path + import collections + + tmpdir = tempfile.mkdtemp() + sessions_dir = Path(tmpdir) / 'sessions' + sessions_dir.mkdir(parents=True, exist_ok=True) + + # Snapshot config BEFORE any mutation so we always restore the real state. + # Note: api.models imports SESSION_DIR at module level, so we must update + # BOTH api.config.SESSION_DIR and api.models.SESSION_DIR. + old_values = { + 'cfg_SESSION_DIR': _cfg.SESSION_DIR, + 'models_SESSION_DIR': getattr(_models, 'SESSION_DIR', None), + 'SESSIONS': _cfg.SESSIONS, + 'LOCK': _cfg.LOCK, + 'SESSION_INDEX_FILE': _cfg.SESSION_INDEX_FILE, + 'SESSION_AGENT_LOCKS': _cfg.SESSION_AGENT_LOCKS, + 'SESSION_AGENT_LOCKS_LOCK': _cfg.SESSION_AGENT_LOCKS_LOCK, + 'SESSIONS_MAX': _cfg.SESSIONS_MAX, + } + + _cfg.SESSION_DIR = sessions_dir + _models.SESSION_DIR = sessions_dir + _cfg.SESSION_INDEX_FILE = sessions_dir / 'index.json' + _cfg.LOCK = threading.Lock() + _cfg.SESSIONS = collections.OrderedDict() + _cfg.SESSIONS_MAX = 100 + _cfg.SESSION_AGENT_LOCKS = {} + _cfg.SESSION_AGENT_LOCKS_LOCK = threading.Lock() + + try: + yield tmpdir + finally: + # Always restore, even on exception + _cfg.SESSION_DIR = old_values['cfg_SESSION_DIR'] + if old_values['models_SESSION_DIR'] is not None: + _models.SESSION_DIR = old_values['models_SESSION_DIR'] + _cfg.SESSIONS = old_values['SESSIONS'] + _cfg.LOCK = old_values['LOCK'] + _cfg.SESSION_INDEX_FILE = old_values['SESSION_INDEX_FILE'] + _cfg.SESSION_AGENT_LOCKS = old_values['SESSION_AGENT_LOCKS'] + _cfg.SESSION_AGENT_LOCKS_LOCK = old_values['SESSION_AGENT_LOCKS_LOCK'] + _cfg.SESSIONS_MAX = old_values['SESSIONS_MAX'] + + import shutil + try: + shutil.rmtree(tmpdir, ignore_errors=True) + except Exception: + pass + + +def test_duplicate_preserves_truncation_watermark(isolated_session_env): + """When duplicating a session with truncation_watermark, the watermark should be copied.""" + from api.models import Session + from api.config import SESSIONS, LOCK + + now = time.time() + watermark_value = now - 50 + original = Session( + session_id='original123', + title='Original Session', + messages=[ + {'role': 'user', 'content': 'Hello', 'timestamp': now - 100}, + {'role': 'assistant', 'content': 'Hi there', 'timestamp': now - 90}, + ], + truncation_watermark=watermark_value, + ) + original.save() + with LOCK: + SESSIONS['original123'] = original + + session = Session.load('original123') + assert session is not None + assert session.truncation_watermark is not None + + # Simulate duplicate endpoint (routes.py:5113) — must include all fields + # that the real endpoint copies, including truncation_watermark. + copied_session = Session( + session_id=uuid.uuid4().hex[:12], + title=(session.title or "Untitled") + " (copy)", + workspace=session.workspace, + model=session.model, + model_provider=session.model_provider, + messages=copy.deepcopy(session.messages), + tool_calls=copy.deepcopy(session.tool_calls), + pinned=False, + archived=False, + project_id=session.project_id, + profile=session.profile, + input_tokens=session.input_tokens, + output_tokens=session.output_tokens, + estimated_cost=session.estimated_cost, + personality=session.personality, + enabled_toolsets=getattr(session, "enabled_toolsets", None), + context_length=getattr(session, "context_length", None), + threshold_tokens=getattr(session, "threshold_tokens", None), + truncation_watermark=getattr(session, "truncation_watermark", None), + created_at=time.time(), + updated_at=time.time(), + ) + + # truncation_watermark MUST be copied from original + assert copied_session.truncation_watermark == watermark_value, \ + f"truncation_watermark should be copied (expected {watermark_value}, got {copied_session.truncation_watermark})" + + +def test_duplicate_edit_does_not_lose_messages(isolated_session_env): + """When editing a message in a duplicated session, messages should not be lost after reload.""" + from api.models import Session, merge_session_messages_append_only, get_state_db_session_messages + from api.config import SESSIONS, LOCK + + now = time.time() + original = Session( + session_id='original456', + title='Original Session', + messages=[ + {'role': 'user', 'content': 'First message', 'timestamp': now - 200}, + {'role': 'assistant', 'content': 'First response', 'timestamp': now - 190}, + {'role': 'user', 'content': 'Second message', 'timestamp': now - 100}, + {'role': 'assistant', 'content': 'Second response', 'timestamp': now - 90}, + ], + ) + original.save() + with LOCK: + SESSIONS['original456'] = original + + # Duplicate the session + session = Session.load('original456') + assert session is not None + + copied_session = Session( + session_id=uuid.uuid4().hex[:12], + title=(session.title or "Untitled") + " (copy)", + workspace=session.workspace, + model=session.model, + model_provider=session.model_provider, + messages=copy.deepcopy(session.messages), + tool_calls=copy.deepcopy(session.tool_calls), + pinned=False, + archived=False, + project_id=session.project_id, + profile=session.profile, + input_tokens=session.input_tokens, + output_tokens=session.output_tokens, + estimated_cost=session.estimated_cost, + personality=session.personality, + enabled_toolsets=getattr(session, "enabled_toolsets", None), + context_length=getattr(session, "context_length", None), + threshold_tokens=getattr(session, "threshold_tokens", None), + created_at=time.time(), + updated_at=time.time(), + ) + copied_session.save() + with LOCK: + SESSIONS[copied_session.session_id] = copied_session + SESSIONS.move_to_end(copied_session.session_id) + + # Simulate edit: truncate to keep first 2 messages, then set watermark + keep_count = 2 + copied_session.messages = copied_session.messages[:keep_count] + from api.session_ops import _truncation_watermark_for + copied_session.truncation_watermark = _truncation_watermark_for(copied_session.messages) + copied_session.save() + + # Reload the duplicated session + reloaded = Session.load(copied_session.session_id) + assert reloaded is not None + + # Messages must be preserved after reload + assert len(reloaded.messages) == keep_count, \ + f"Expected {keep_count} messages after truncate+reload, got {len(reloaded.messages)}" + + # Watermark must be preserved + assert reloaded.truncation_watermark is not None, \ + "truncation_watermark should be preserved after save/load" + + # Merge with state.db (empty for new session) must not lose messages + state_messages = get_state_db_session_messages(copied_session.session_id) + merged = merge_session_messages_append_only( + reloaded.messages, + state_messages, + truncation_watermark=reloaded.truncation_watermark, + ) + + assert len(merged) >= keep_count, \ + f"Expected at least {keep_count} messages after merge, got {len(merged)}" diff --git a/tests/test_session_duplicate_fields.py b/tests/test_session_duplicate_fields.py new file mode 100644 index 0000000000..fdb8877768 --- /dev/null +++ b/tests/test_session_duplicate_fields.py @@ -0,0 +1,467 @@ +"""Tests for session field propagation on duplicate and branch. + +Verifies that critical Session fields are copied when duplicating or +branching a session, preventing data loss scenarios like: + - truncation_watermark not carried → merge with state.db drops messages + - context_messages not carried → agent sees different context + - gateway_routing not carried → routing customization lost + - enabled_toolsets not carried → toolset override lost + - context_engine_state not carried → context engine state lost + +These are static-analysis tests (source inspection) matching the +conventions of the existing test suite. +""" +import re + + +def _extract_duplicate_block(): + """Extract the duplicate handler block from routes.py.""" + with open('api/routes.py') as f: + src = f.read() + match = re.search( + r'parsed\.path == "/api/session/duplicate"(.*?)(?=\n if parsed\.path|$)', + src, re.DOTALL + ) + assert match, "Could not find /api/session/duplicate handler block" + return match.group(1), src + + +def _extract_branch_block(): + """Extract the branch handler block from routes.py.""" + with open('api/routes.py') as f: + src = f.read() + match = re.search( + r'parsed\.path == "/api/session/branch"(.*?)(?=\n if parsed\.path|$)', + src, re.DOTALL + ) + assert match, "Could not find /api/session/branch handler block" + return match.group(1), src + + +def _find_session_ctor(block, var_name='copied_session'): + """Find the Session() constructor call in a block and return its body.""" + # Match from "var_name = Session(" to the closing ")" + pattern = rf'{var_name}\s*=\s*Session\((.*?)\)\s*$' + match = re.search(pattern, block, re.DOTALL) + assert match, f"Could not find {var_name} = Session() constructor" + return match.group(1) + + +def _has_field(ctor_body, field_name): + """Check if a field is present in the constructor body.""" + return f'{field_name}=' in ctor_body + + +def _has_deepcopy_for(ctor_body, field_name): + """Check if a field uses deepcopy in the constructor.""" + # Find the line containing the field assignment + lines = ctor_body.split('\n') + for line in lines: + if f'{field_name}=' in line: + return 'deepcopy' in line + return False + + +# ── Duplicate: critical fields MUST be copied ──────────────────────────────── + +def test_duplicate_copies_truncation_watermark(): + """truncation_watermark must be copied to prevent state.db merge from + dropping messages after edit in a duplicated session (#2914).""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'truncation_watermark'), \ + "Duplicate must copy truncation_watermark" + + +def test_duplicate_copies_context_messages(): + """context_messages is the authoritative model-facing prefix. Without it, + the duplicate's agent context diverges from what the user sees.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'context_messages'), \ + "Duplicate must copy context_messages" + assert _has_deepcopy_for(ctor, 'context_messages'), \ + "context_messages must be deepcopied (mutable list)" + + +def test_duplicate_copies_gateway_routing(): + """gateway_routing customization must survive duplication.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'gateway_routing'), \ + "Duplicate must copy gateway_routing" + assert _has_deepcopy_for(ctor, 'gateway_routing'), \ + "gateway_routing must be deepcopied (mutable dict)" + + +def test_duplicate_copies_gateway_routing_history(): + """gateway_routing_history must survive duplication.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'gateway_routing_history'), \ + "Duplicate must copy gateway_routing_history" + assert _has_deepcopy_for(ctor, 'gateway_routing_history'), \ + "gateway_routing_history must be deepcopied (mutable list)" + + +def test_duplicate_copies_cache_tokens(): + """Cache token counters should be preserved for accurate usage tracking.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'cache_read_tokens'), \ + "Duplicate must copy cache_read_tokens" + assert _has_field(ctor, 'cache_write_tokens'), \ + "Duplicate must copy cache_write_tokens" + + +def test_duplicate_copies_enabled_toolsets(): + """Per-session toolset override must survive duplication.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'enabled_toolsets'), \ + "Duplicate must copy enabled_toolsets" + + +def test_duplicate_copies_llm_title_generated(): + """llm_title_generated flag should be preserved to avoid regenerating title.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'llm_title_generated'), \ + "Duplicate must copy llm_title_generated" + + +def test_duplicate_copies_composer_draft(): + """Per-session composer draft should be preserved.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'composer_draft'), \ + "Duplicate must copy composer_draft" + assert _has_deepcopy_for(ctor, 'composer_draft'), \ + "composer_draft must be deepcopied (mutable dict)" + + +def test_duplicate_copies_context_engine(): + """Context engine must be preserved so duplicate's context engine starts correctly.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'context_engine'), \ + "Duplicate must copy context_engine" + assert _has_field(ctor, 'context_engine_state'), \ + "Duplicate must copy context_engine_state" + assert _has_deepcopy_for(ctor, 'context_engine_state'), \ + "context_engine_state must be deepcopied (mutable dict)" + + +def test_duplicate_copies_model_provider(): + """model_provider must survive duplication.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'model_provider'), \ + "Duplicate must copy model_provider" + + +def test_duplicate_copies_personality(): + """personality must survive duplication.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'personality'), \ + "Duplicate must copy personality" + + +def test_duplicate_copies_project_id(): + """project_id must survive duplication.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'project_id'), \ + "Duplicate must copy project_id" + + +def test_duplicate_copies_profile(): + """profile must survive duplication.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'profile'), \ + "Duplicate must copy profile" + + +def test_duplicate_copies_context_length(): + """context_length must survive duplication.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'context_length'), \ + "Duplicate must copy context_length" + + +def test_duplicate_copies_threshold_tokens(): + """threshold_tokens must survive duplication.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'threshold_tokens'), \ + "Duplicate must copy threshold_tokens" + + +def test_duplicate_copies_workspace(): + """workspace must survive duplication.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'workspace'), \ + "Duplicate must copy workspace" + + +def test_duplicate_copies_model(): + """model must survive duplication.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'model'), \ + "Duplicate must copy model" + + +def test_duplicate_copies_usage_counters(): + """Token usage counters must be preserved for accurate billing tracking.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_field(ctor, 'input_tokens'), \ + "Duplicate must copy input_tokens" + assert _has_field(ctor, 'output_tokens'), \ + "Duplicate must copy output_tokens" + assert _has_field(ctor, 'estimated_cost'), \ + "Duplicate must copy estimated_cost" + + +# ── Duplicate: mutable fields MUST use deepcopy ────────────────────────────── + +def test_duplicate_deepcopies_messages(): + """messages must be deepcopied to prevent shared list mutation.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_deepcopy_for(ctor, 'messages'), \ + "messages must be deepcopied (mutable list of dicts)" + + +def test_duplicate_deepcopies_tool_calls(): + """tool_calls must be deepcopied to prevent shared list mutation.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert _has_deepcopy_for(ctor, 'tool_calls'), \ + "tool_calls must be deepcopied (mutable list)" + + +# ── Duplicate: intentionally NOT copied (ephemeral / re-derived) ──────────── + +def test_duplicate_resets_pinned(): + """Pinned status should NOT transfer to duplicate.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert 'pinned=False' in ctor, \ + "Duplicate should reset pinned to False" + + +def test_duplicate_resets_archived(): + """Archived status should NOT transfer to duplicate.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert 'archived=False' in ctor, \ + "Duplicate should reset archived to False" + + +def test_duplicate_does_not_copy_compression_anchor(): + """Compression anchor fields are intentionally NOT carried — they + re-derive on the next turn (per existing comment).""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert not _has_field(ctor, 'compression_anchor_visible_idx'), \ + "compression_anchor_visible_idx should NOT be copied (re-derives)" + assert not _has_field(ctor, 'compression_anchor_message_key'), \ + "compression_anchor_message_key should NOT be copied (re-derives)" + assert not _has_field(ctor, 'compression_anchor_summary'), \ + "compression_anchor_summary should NOT be copied (re-derives)" + assert not _has_field(ctor, 'compression_anchor_details'), \ + "compression_anchor_details should NOT be copied (re-derives)" + assert not _has_field(ctor, 'compression_anchor_mode'), \ + "compression_anchor_mode should NOT be copied (re-derives)" + assert not _has_field(ctor, 'compression_anchor_engine'), \ + "compression_anchor_engine should NOT be copied (re-derives)" + + +def test_duplicate_does_not_copy_worktree(): + """Worktree fields must NOT transfer — they are per-session-instance.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert not _has_field(ctor, 'worktree_path'), \ + "worktree_path should NOT be copied (per-instance)" + assert not _has_field(ctor, 'worktree_branch'), \ + "worktree_branch should NOT be copied (per-instance)" + assert not _has_field(ctor, 'worktree_repo_root'), \ + "worktree_repo_root should NOT be copied (per-instance)" + + +def test_duplicate_does_not_copy_last_prompt_tokens(): + """last_prompt_tokens is intentionally NOT carried — re-derives on next turn.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert not _has_field(ctor, 'last_prompt_tokens'), \ + "last_prompt_tokens should NOT be copied (re-derives)" + + +def test_duplicate_does_not_copy_ephemeral(): + """Ephemeral fields (active_stream_id, pending_*) must NOT transfer.""" + block, _ = _extract_duplicate_block() + ctor = _find_session_ctor(block) + assert not _has_field(ctor, 'active_stream_id'), \ + "active_stream_id should NOT be copied (ephemeral)" + assert not _has_field(ctor, 'pending_user_message'), \ + "pending_user_message should NOT be copied (ephemeral)" + assert not _has_field(ctor, 'pending_attachments'), \ + "pending_attachments should NOT be copied (ephemeral)" + assert not _has_field(ctor, 'pending_started_at'), \ + "pending_started_at should NOT be copied (ephemeral)" + + +# ── Branch: critical fields MUST be copied ────────────────────────────────── + +def test_branch_copies_model_provider(): + """Branch must inherit model_provider from source.""" + block, _ = _extract_branch_block() + ctor = _find_session_ctor(block, 'branch') + assert _has_field(ctor, 'model_provider'), \ + "Branch must copy model_provider" + + +def test_branch_copies_project_id(): + """Branch must inherit project_id from source.""" + block, _ = _extract_branch_block() + ctor = _find_session_ctor(block, 'branch') + assert _has_field(ctor, 'project_id'), \ + "Branch must copy project_id" + + +def test_branch_copies_personality(): + """Branch must inherit personality from source.""" + block, _ = _extract_branch_block() + ctor = _find_session_ctor(block, 'branch') + assert _has_field(ctor, 'personality'), \ + "Branch must copy personality" + + +def test_branch_copies_enabled_toolsets(): + """Branch must inherit enabled_toolsets from source.""" + block, _ = _extract_branch_block() + ctor = _find_session_ctor(block, 'branch') + assert _has_field(ctor, 'enabled_toolsets'), \ + "Branch must copy enabled_toolsets" + + +def test_branch_copies_context_messages(): + """Branch must deep-copy context_messages for independent context.""" + block, _ = _extract_branch_block() + ctor = _find_session_ctor(block, 'branch') + assert _has_field(ctor, 'context_messages'), \ + "Branch must copy context_messages" + assert _has_deepcopy_for(ctor, 'context_messages'), \ + "context_messages must be deepcopied in branch" + + +def test_branch_copies_gateway_routing(): + """Branch must inherit gateway_routing from source.""" + block, _ = _extract_branch_block() + ctor = _find_session_ctor(block, 'branch') + assert _has_field(ctor, 'gateway_routing'), \ + "Branch must copy gateway_routing" + assert _has_deepcopy_for(ctor, 'gateway_routing'), \ + "gateway_routing must be deepcopied in branch" + + +def test_branch_copies_context_length(): + """Branch must inherit context_length from source.""" + block, _ = _extract_branch_block() + ctor = _find_session_ctor(block, 'branch') + assert _has_field(ctor, 'context_length'), \ + "Branch must copy context_length" + + +def test_branch_copies_threshold_tokens(): + """Branch must inherit threshold_tokens from source.""" + block, _ = _extract_branch_block() + ctor = _find_session_ctor(block, 'branch') + assert _has_field(ctor, 'threshold_tokens'), \ + "Branch must copy threshold_tokens" + + +def test_branch_copies_context_engine(): + """Branch must inherit context_engine state from source.""" + block, _ = _extract_branch_block() + ctor = _find_session_ctor(block, 'branch') + assert _has_field(ctor, 'context_engine'), \ + "Branch must copy context_engine" + assert _has_field(ctor, 'context_engine_state'), \ + "Branch must copy context_engine_state" + assert _has_deepcopy_for(ctor, 'context_engine_state'), \ + "context_engine_state must be deepcopied in branch" + + +# ── Branch: intentionally NOT copied ──────────────────────────────────────── + +def test_branch_does_not_copy_compression_anchor(): + """Branch should not copy compression anchor fields (re-derive).""" + block, _ = _extract_branch_block() + ctor = _find_session_ctor(block, 'branch') + assert not _has_field(ctor, 'compression_anchor_visible_idx'), \ + "compression_anchor_visible_idx should NOT be copied in branch" + + +def test_branch_does_not_copy_truncation_watermark(): + """truncation_watermark must NOT be copied in branch — the branch starts + with a fresh message slice and watermark from the original session would + cause state.db merge to incorrectly filter messages in the branch.""" + block, _ = _extract_branch_block() + ctor = _find_session_ctor(block, 'branch') + assert not _has_field(ctor, 'truncation_watermark'), \ + "truncation_watermark should NOT be copied in branch" + + +def test_branch_does_not_copy_usage_counters(): + """Branch starts a new conversation — token counters must NOT carry over.""" + block, _ = _extract_branch_block() + ctor = _find_session_ctor(block, 'branch') + assert not _has_field(ctor, 'input_tokens'), \ + "input_tokens should NOT be copied in branch" + assert not _has_field(ctor, 'output_tokens'), \ + "output_tokens should NOT be copied in branch" + assert not _has_field(ctor, 'estimated_cost'), \ + "estimated_cost should NOT be copied in branch" + + +def test_branch_does_not_copy_tool_calls(): + """Branch must NOT inherit tool_calls from source.""" + block, _ = _extract_branch_block() + ctor = _find_session_ctor(block, 'branch') + assert not _has_field(ctor, 'tool_calls'), \ + "tool_calls should NOT be copied in branch" + + +def test_branch_does_not_copy_gateway_routing_history(): + """Branch starts its own routing history.""" + block, _ = _extract_branch_block() + ctor = _find_session_ctor(block, 'branch') + assert not _has_field(ctor, 'gateway_routing_history'), \ + "gateway_routing_history should NOT be copied in branch" + + +def test_branch_sets_session_source(): + """Branch must set session_source='fork' for lineage tracking.""" + block, _ = _extract_branch_block() + ctor = _find_session_ctor(block, 'branch') + assert 'session_source=' in ctor, \ + "Branch must set session_source" + assert '"fork"' in ctor or "'fork'" in ctor, \ + "session_source must be 'fork'" + + +def test_branch_does_not_copy_ephemeral(): + """Branch should not copy ephemeral fields.""" + block, _ = _extract_branch_block() + ctor = _find_session_ctor(block, 'branch') + assert not _has_field(ctor, 'active_stream_id'), \ + "active_stream_id should NOT be copied in branch" + assert not _has_field(ctor, 'pending_user_message'), \ + "pending_user_message should NOT be copied in branch" From 315cca2ec7c49c95abdad2079b857472be23215b Mon Sep 17 00:00:00 2001 From: nesquena-hermes <[email protected]> Date: Sat, 30 May 2026 01:26:21 +0000 Subject: [PATCH 262/349] stage-batch45: CHANGELOG for v0.51.163 (Release EI) --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fdff913d6b..3eb9b42026 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ ## [Unreleased] +## [v0.51.163] — 2026-05-30 — Release EI (stage-batch45 — session duplicate/branch field propagation) + +### Fixed + +- Duplicating or branching a session now carries over the fields that were previously dropped, so the copy behaves identically to the original until further edits: `truncation_watermark`, model-facing `context_messages` (deep-copied for independence), gateway routing + routing history, context-engine state, cache-token counters, composer draft, LLM-title flag, and per-session settings (model provider, project, personality, toolsets, context length, threshold). Compression anchors and last-prompt-token counts are intentionally not carried so the copy re-derives them. Prevents data-loss scenarios where, e.g., editing a message in a duplicated session would drop messages during state.db merge. + ## [v0.51.162] — 2026-05-30 — Release EH (stage-batch44 — conversation-filter clear button + code-only title-language regression coverage) ### Added From b53bc1a2ea8620b144f28fa0d25af780c8bcdd81 Mon Sep 17 00:00:00 2001 From: AJV20 <24819659+AJV20@users.noreply.github.com> Date: Thu, 28 May 2026 20:15:54 -0400 Subject: [PATCH 263/349] fix: harden webui passive performance paths --- ARCHITECTURE.md | 1 + CHANGELOG.md | 8 ++ README.md | 12 ++- api/routes.py | 31 ++++--- api/updates.py | 82 ++++++++++++++---- static/messages.js | 16 +++- static/sessions.js | 45 +++++++++- static/ui.js | 21 ++++- tests/test_api_timeout.py | 3 + .../test_firefox_sidebar_scroll_stability.py | 18 ++-- ...t_issue856_background_completion_unread.py | 6 +- tests/test_live_activity_timeline.py | 18 +++- tests/test_performance_polling_hardening.py | 43 ++++++++++ ...test_stage326_composer_draft_validation.py | 18 +++- tests/test_update_banner_fixes.py | 84 +++++++++++++++++++ tests/test_updates.py | 4 +- 16 files changed, 358 insertions(+), 52 deletions(-) create mode 100644 tests/test_performance_polling_hardening.py diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index 55884d7187..98946a4e97 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -125,6 +125,7 @@ Environment variables controlling behavior: HERMES_PREFILL_MESSAGES_FILE Optional JSON message list for browser-turn prefill context HERMES_WEBUI_PREFILL_MESSAGES_SCRIPT Optional command that prints JSON messages or plain-text user prefill context HERMES_WEBUI_PREFILL_MESSAGES_SCRIPT_TIMEOUT Optional script timeout in seconds (default 5, max 30) + HERMES_WEBUI_PREFILL_CONTEXT_MAX_CHARS Optional parsed prefill budget in characters (default 12000, 0 disables) HERMES_HOME Base directory for Hermes state (~/.hermes by default) Test isolation environment variables (set by conftest.py): diff --git a/CHANGELOG.md b/CHANGELOG.md index 3eb9b42026..05418d4399 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ ## [Unreleased] +### Fixed + +- Coalesced duplicate in-flight sidebar/project refreshes and suppressed overlapping approval/clarify fallback polls, reducing repeated passive requests while preserving latest-refresh-wins sidebar state. +- Skipped duplicate composer-draft writes when the normalized autosave payload is unchanged, avoiding redundant full session JSON rewrites during debounced input/focus churn. +- Refined empty Activity waiting placeholders to distinguish stream creation, first-token wait, post-tool model wait, and running-tool wait states. +- Self-update restart safety now checks active agent runs as well as open SSE streams and waits for in-flight work before re-exec, avoiding update-triggered interruption when a run outlives its browser stream. +- Documented the WebUI prefill context budget in README and architecture notes so operators can keep new-browser-turn startup context compact. + ## [v0.51.163] — 2026-05-30 — Release EI (stage-batch45 — session duplicate/branch field propagation) ### Fixed diff --git a/README.md b/README.md index d5208b5530..9ce29386cd 100644 --- a/README.md +++ b/README.md @@ -158,9 +158,15 @@ a `messages` list, or plain text; plain text is wrapped as one `user` prefill message so dynamic recall text becomes ordinary context instead of an extra system instruction. If the hook must provide system-level guidance, emit JSON messages with an explicit `role: "system"` entry instead. Script output is capped -at 256 KiB before parsing. The browser only receives a compact status event -(`source`, `label`, message count, and redacted errors), never the prefill -message bodies. +at 256 KiB before parsing. Parsed prefill context is then bounded by +`webui_prefill_context_max_chars` or `HERMES_WEBUI_PREFILL_CONTEXT_MAX_CHARS` +(default: 12,000 characters; set to `0` to disable). When a dynamic script +exceeds the budget and a compact static prefill file is configured, WebUI falls +back to that file. If no compact fallback is available, WebUI injects a short +retrieval instruction instead of sending the oversized note/body payload with +every new browser turn. The browser only receives a compact status event +(`source`, `label`, message count, compaction metadata, and redacted errors), +never the prefill message bodies. ### Optional Gateway-backed browser chat diff --git a/api/routes.py b/api/routes.py index a559f65fd5..71f29dad35 100644 --- a/api/routes.py +++ b/api/routes.py @@ -5637,19 +5637,30 @@ def handle_post(handler, parsed) -> bool: s = get_session(sid) except KeyError: return bad(handler, "Session not found", 404) + unchanged = False with _get_session_agent_lock(sid): - draft = getattr(s, "composer_draft", {}) or {} + current_draft = dict(getattr(s, "composer_draft", {}) or {}) + next_draft = dict(current_draft) if text is not None: - draft["text"] = text + next_draft["text"] = text if files is not None: - draft["files"] = files - s.composer_draft = draft - # Draft persistence is not conversation activity. Touching updated_at - # here makes the active-session external-refresh poll force-reload the - # current chat every few seconds while the user is typing, and that - # delayed reload can restore an older draft over newer local input. - s.save(touch_updated_at=False, skip_index=True) - return j(handler, {"ok": True, "draft": s.composer_draft}) + next_draft["files"] = files + if next_draft == current_draft: + unchanged = True + saved_draft = current_draft + else: + s.composer_draft = next_draft + # Draft persistence is not conversation activity. Touching updated_at + # here makes the active-session external-refresh poll force-reload the + # current chat every few seconds while the user is typing, and that + # delayed reload can restore an older draft over newer local input. + s.save(touch_updated_at=False, skip_index=True) + saved_draft = s.composer_draft + payload = {"ok": True, "draft": saved_draft} + if unchanged: + payload["unchanged"] = True + j(handler, payload) + return True if parsed.path == "/api/session/update": try: diff --git a/api/updates.py b/api/updates.py index 93c6ce9525..da207a3255 100644 --- a/api/updates.py +++ b/api/updates.py @@ -60,32 +60,81 @@ def _sanitize_git_diagnostic(output: str, *, limit: int = _GIT_DIAGNOSTIC_MAX_CH return sanitized +def _restart_blocker_snapshot() -> dict: + """Return active chat work that should block a self-restart.""" + with STREAMS_LOCK: + stream_ids = [str(k) for k in STREAMS.keys()] + run_ids: list[str] = [] + try: + from api import config as _config + active_runs = getattr(_config, 'ACTIVE_RUNS', {}) + active_runs_lock = getattr(_config, 'ACTIVE_RUNS_LOCK', None) + if active_runs_lock is not None: + with active_runs_lock: + run_ids = [str(k) for k in active_runs.keys()] + else: + run_ids = [str(k) for k in active_runs.keys()] + except Exception: + run_ids = [] + return { + 'active_streams': len(stream_ids), + 'active_runs': len(run_ids), + 'blocking_stream_ids': stream_ids[:10], + 'blocking_run_ids': run_ids[:10], + 'restart_blocked': bool(stream_ids or run_ids), + } + + def _active_stream_count() -> int: """Return the current in-memory chat stream count. - Self-update schedules an in-process re-exec after git pull/reset. That is - restart-equivalent for live streams, even when systemd does not see a unit - restart. Refuse update/force-update while a stream exists so a browser - update click cannot recreate the pending-message loss class fixed in #1543. + Kept for compatibility with older tests/helpers; restart safety should use + ``_restart_blocker_snapshot()`` so detached worker runs also block updates. """ - with STREAMS_LOCK: - return len(STREAMS) + return int(_restart_blocker_snapshot().get('active_streams') or 0) -def _restart_blocked_response(target: str, active_streams: int) -> dict: - plural = "s" if active_streams != 1 else "" +def _restart_blocked_response(target: str, blocker_snapshot: dict | int) -> dict: + if isinstance(blocker_snapshot, int): + blocker_snapshot = { + 'active_streams': blocker_snapshot, + 'active_runs': 0, + 'blocking_stream_ids': [], + 'blocking_run_ids': [], + 'restart_blocked': bool(blocker_snapshot), + } + active_streams = int(blocker_snapshot.get('active_streams') or 0) + active_runs = int(blocker_snapshot.get('active_runs') or 0) + parts = [] + if active_streams: + parts.append(f"{active_streams} active chat stream{'s' if active_streams != 1 else ''}") + if active_runs: + parts.append(f"{active_runs} active agent run{'s' if active_runs != 1 else ''}") + detail = ' and '.join(parts) or 'active chat work' return { 'ok': False, 'message': ( - f'Cannot update {target} while {active_streams} active chat stream{plural} ' - 'is running. Wait for the response to finish, then retry the update.' + f'Cannot update {target} while {detail} is running. ' + 'Wait for the response to finish, then retry the update.' ), 'target': target, 'restart_blocked': True, 'active_streams': active_streams, + 'active_runs': active_runs, + 'blocking_stream_ids': blocker_snapshot.get('blocking_stream_ids') or [], + 'blocking_run_ids': blocker_snapshot.get('blocking_run_ids') or [], } +def _wait_until_restart_safe(poll_seconds: float = 2.0) -> dict: + """Wait for active work to finish before self-reexec.""" + snapshot = _restart_blocker_snapshot() + while snapshot.get('restart_blocked'): + time.sleep(max(0.1, poll_seconds)) + snapshot = _restart_blocker_snapshot() + return snapshot + + def _run_git(args, cwd, timeout=10): """Run a git command and return (useful output, ok). @@ -928,6 +977,7 @@ def _do(): # Threads die when execv replaces the process image, so the lock is # released atomically by the kernel. with _apply_lock: + _wait_until_restart_safe() try: os.execv(sys.executable, [sys.executable] + sys.argv) except Exception: @@ -950,9 +1000,9 @@ def apply_force_update(target: str) -> dict: response with ``conflict: True`` or ``diverged: True`` and the user has confirmed they want to discard local changes. """ - active_streams = _active_stream_count() - if active_streams: - return _restart_blocked_response(target, active_streams) + blocker_snapshot = _restart_blocker_snapshot() + if blocker_snapshot.get('restart_blocked'): + return _restart_blocked_response(target, blocker_snapshot) if not _apply_lock.acquire(blocking=False): return {'ok': False, 'message': 'Update already in progress'} @@ -1002,9 +1052,9 @@ def apply_force_update(target: str) -> dict: def apply_update(target): """Stash, pull --ff-only, pop for the given target repo.""" - active_streams = _active_stream_count() - if active_streams: - return _restart_blocked_response(target, active_streams) + blocker_snapshot = _restart_blocker_snapshot() + if blocker_snapshot.get('restart_blocked'): + return _restart_blocked_response(target, blocker_snapshot) if not _apply_lock.acquire(blocking=False): return {'ok': False, 'message': 'Update already in progress'} diff --git a/static/messages.js b/static/messages.js index 1c92a2aef9..5af08e2fce 100644 --- a/static/messages.js +++ b/static/messages.js @@ -564,6 +564,7 @@ async function send(){ } streamId=startData.stream_id; S.activeStreamId = streamId; + if(typeof appendThinking==='function') appendThinking('',{pending:true}); // setBusy(true) already ran with activeStreamId=null; refresh now that we // have a stream id so the primary button can switch to Stop (see getComposerPrimaryAction). if(typeof updateSendBtn==='function') updateSendBtn(); @@ -2507,6 +2508,7 @@ async function toggleYoloFromApproval() { // ── Approval polling ── let _approvalPollTimer = null; +let _approvalFallbackPollInFlight = false; let _approvalHideTimer = null; let _approvalVisibleSince = 0; let _approvalSignature = ''; @@ -2707,11 +2709,14 @@ function _startApprovalFallbackPoll(sid) { if (!S.busy || !S.session || S.session.session_id !== sid) { stopApprovalPolling(); _hideApprovalCardIfOwner(sid, true); return; } + if (_approvalFallbackPollInFlight) return; + _approvalFallbackPollInFlight = true; try { - const data = await api("/api/approval/pending?session_id=" + encodeURIComponent(sid)); + const data = await api("/api/approval/pending?session_id=" + encodeURIComponent(sid),{timeoutToast:false}); if (data.pending) { showApprovalForSession(sid, data.pending, data.pending_count||1); } else { _clearApprovalPendingForSession(sid); _hideApprovalCardIfOwner(sid); } } catch(e) { /* ignore poll errors */ } + finally { _approvalFallbackPollInFlight = false; } }, 1500); // matches the v0.50.247 polling cadence so degraded-mode users see the same responsiveness } @@ -2724,6 +2729,7 @@ function stopApprovalPolling() { if (_approvalPollTimer) { clearInterval(_approvalPollTimer); _approvalPollTimer = null; } if (_approvalEventSource) { try { _approvalEventSource.close(); } catch(_){} _approvalEventSource = null; } if (_approvalSSEHealthTimer) { clearInterval(_approvalSSEHealthTimer); _approvalSSEHealthTimer = null; } + _approvalFallbackPollInFlight = false; _approvalPollingSessionId = null; } @@ -3197,6 +3203,7 @@ async function respondClarify(response) { var _clarifyEventSource = null; var _clarifyFallbackTimer = null; var _clarifyHealthTimer = null; +let _clarifyFallbackPollInFlight = false; let _clarifyPollingSessionId = null; function startClarifyPolling(sid) { @@ -3265,8 +3272,10 @@ function _startClarifyFallbackPoll(sid) { if (!S.session || S.session.session_id !== sid) { stopClarifyPolling(); _hideClarifyCardIfOwner(sid, true, 'session'); return; } + if (_clarifyFallbackPollInFlight) return; + _clarifyFallbackPollInFlight = true; try { - const data = await api("/api/clarify/pending?session_id=" + encodeURIComponent(sid)); + const data = await api("/api/clarify/pending?session_id=" + encodeURIComponent(sid),{timeoutToast:false}); if (data.pending) { showClarifyForSession(sid, data.pending); } else { _clearClarifyPendingForSession(sid); _hideClarifyCardIfOwner(sid, false, 'expired'); } } catch(e) { @@ -3279,6 +3288,8 @@ function _startClarifyFallbackPoll(sid) { } stopClarifyPolling(); } + } finally { + _clarifyFallbackPollInFlight = false; } }, 3000); } @@ -3292,6 +3303,7 @@ function stopClarifyPolling() { if (_clarifyEventSource) { try { _clarifyEventSource.close(); } catch(_){} _clarifyEventSource = null; } if (_clarifyFallbackTimer) { clearInterval(_clarifyFallbackTimer); _clarifyFallbackTimer = null; } if (_clarifyHealthTimer) { clearInterval(_clarifyHealthTimer); _clarifyHealthTimer = null; } + _clarifyFallbackPollInFlight = false; _clarifyPollingSessionId = null; } diff --git a/static/sessions.js b/static/sessions.js index e14d19529e..c76360dbc4 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -2098,6 +2098,8 @@ window.addEventListener('resize',()=>{ // concurrently. Without this guard, a slower older response can overwrite _allSessions // with stale data, causing sessions to vanish from the sidebar. let _renderSessionListGen = 0; +let _renderSessionListInFlight = null; +let _renderSessionListQueuedRequest = null; let _sessionListRefreshAnimationPending = false; let _sessionListFirstRenderAnimated = false; let _sessionListEnterAllAnimationPending = false; @@ -2292,9 +2294,17 @@ function _applySessionListPayload(sessData, projData){ renderSessionListFromCache(); // no-ops if rename is in progress } -async function renderSessionList(opts={}){ +function _mergeRenderSessionListOptions(prev, next){ + const merged={...(prev||{}),...(next||{})}; + // Immediate refreshes must not be downgraded by a later passive polling tick. + if((prev&&prev.deferWhileInteracting===false)||(next&&next.deferWhileInteracting===false)){ + merged.deferWhileInteracting=false; + } + return merged; +} + +async function _runRenderSessionListRefresh(opts, _gen){ const deferWhileInteracting=Boolean(opts&&opts.deferWhileInteracting); - const _gen = ++_renderSessionListGen; if(!deferWhileInteracting) _pendingSessionListPayload=null; try{ if(!($('sessionSearch').value||'').trim()) _contentSearchResults = []; @@ -2314,6 +2324,37 @@ async function renderSessionList(opts={}){ }catch(e){console.warn('renderSessionList',e);} } +async function _drainRenderSessionListQueue(initialRequest){ + let request=initialRequest; + try{ + while(request){ + await _runRenderSessionListRefresh(request.opts, request.gen); + request=_renderSessionListQueuedRequest; + _renderSessionListQueuedRequest=null; + } + }finally{ + _renderSessionListInFlight=null; + if(_renderSessionListQueuedRequest){ + const next=_renderSessionListQueuedRequest; + _renderSessionListQueuedRequest=null; + _renderSessionListInFlight=_drainRenderSessionListQueue(next); + } + } +} + +async function renderSessionList(opts={}){ + const request={opts:opts||{},gen:++_renderSessionListGen}; + if(_renderSessionListInFlight){ + _renderSessionListQueuedRequest={ + opts:_mergeRenderSessionListOptions(_renderSessionListQueuedRequest&&_renderSessionListQueuedRequest.opts, request.opts), + gen:request.gen, + }; + return _renderSessionListInFlight; + } + _renderSessionListInFlight=_drainRenderSessionListQueue(request); + return _renderSessionListInFlight; +} + // ── Gateway session SSE (real-time sync for agent sessions) ── let _gatewaySSE = null; let _gatewayPollTimer = null; diff --git a/static/ui.js b/static/ui.js index 52be1f184a..50ffce7863 100644 --- a/static/ui.js +++ b/static/ui.js @@ -7996,10 +7996,23 @@ function appendThinking(text='', options){ const body=group&&group.querySelector('.tool-call-group-body'); if(!body) return; if(!cleanThinking||cleanThinking==='Thinking…'){ - const label=body.querySelector('.tool-card.tool-card-running')?'Waiting on tool result':'Waiting on model'; - const detail=body.querySelector('.tool-card-row') - ? 'The agent is running; tool results and response text will appear here.' - : 'No tool activity has been reported yet.'; + const hasRunningTool=!!body.querySelector('.tool-card.tool-card-running'); + const hasToolCard=!!body.querySelector('.tool-card-row'); + let label; + let detail; + if(!S.activeStreamId && options && options.pending){ + label='Starting agent'; + detail='Creating the stream and sending your message…'; + }else if(hasRunningTool){ + label='Waiting on tool result'; + detail='The tool is still running; the response will continue after it completes.'; + }else if(hasToolCard){ + label='Waiting on model'; + detail='Tool finished; waiting for the model to continue.'; + }else{ + label='Waiting for first model token'; + detail='Stream connected; no model output has arrived yet.'; + } _appendActivityEvent(group,{id:'thinking-placeholder',kind:'waiting',label,detail,status:'waiting',ts:_activityNowSeconds()}); const active=body.querySelector('.agent-activity-thinking[data-thinking-active="1"]'); if(active) active.removeAttribute('data-thinking-active'); diff --git a/tests/test_api_timeout.py b/tests/test_api_timeout.py index f5a51fcc7b..61788883a2 100644 --- a/tests/test_api_timeout.py +++ b/tests/test_api_timeout.py @@ -221,6 +221,7 @@ def test_passive_background_polls_suppress_timeout_toasts(): """Passive refreshes should be best-effort and not emit generic timeout toasts.""" workspace = _source(WORKSPACE_JS) sessions = _source(SESSIONS_JS) + messages = _source(ROOT / "static" / "messages.js") ui = _source(UI_JS) panels = _source(PANELS_JS) @@ -228,6 +229,8 @@ def test_passive_background_polls_suppress_timeout_toasts(): assert "api('/api/sessions' + allProfilesQS,{timeoutToast:false})" in sessions assert "api('/api/projects' + allProfilesQS,{timeoutToast:false})" in sessions assert "api(`/api/session?session_id=${encodeURIComponent(sid)}&messages=0&resolve_model=0`,{timeoutToast:false})" in sessions + assert 'api("/api/approval/pending?session_id=" + encodeURIComponent(sid),{timeoutToast:false})' in messages + assert 'api("/api/clarify/pending?session_id=" + encodeURIComponent(sid),{timeoutToast:false})' in messages assert "api('/api/dashboard/status',{timeoutToast:false})" in ui assert "api('/api/system/health',{timeoutToast:false})" in ui assert "api('/api/health/agent',{timeoutToast:false})" in ui diff --git a/tests/test_firefox_sidebar_scroll_stability.py b/tests/test_firefox_sidebar_scroll_stability.py index 5c9e00c6b8..1df3cc8cd2 100644 --- a/tests/test_firefox_sidebar_scroll_stability.py +++ b/tests/test_firefox_sidebar_scroll_stability.py @@ -25,15 +25,17 @@ def test_session_list_disables_browser_scroll_anchoring(): def test_polling_payloads_are_deferred_while_user_scrolls_sidebar(): render_block = _block("async function renderSessionList", "// ── Gateway session SSE") - apply_block = _block("function _applySessionListPayload", "async function renderSessionList") + refresh_block = _block("async function _runRenderSessionListRefresh", "async function _drainRenderSessionListQueue") + apply_block = _block("function _applySessionListPayload", "function _mergeRenderSessionListOptions") assert "function _isSessionListUserInteracting()" in SESSIONS_JS assert "async function renderSessionList(opts={})" in render_block - assert "const deferWhileInteracting=Boolean(opts&&opts.deferWhileInteracting);" in render_block - assert "if(deferWhileInteracting&&_isSessionListUserInteracting())" in render_block - assert "_pendingSessionListPayload={gen:_gen,sessData,projData};" in render_block - assert "_schedulePendingSessionListApply();" in render_block - assert "_applySessionListPayload(sessData,projData);" in render_block + assert "async function _runRenderSessionListRefresh(opts, _gen)" in refresh_block + assert "const deferWhileInteracting=Boolean(opts&&opts.deferWhileInteracting);" in refresh_block + assert "if(deferWhileInteracting&&_isSessionListUserInteracting())" in refresh_block + assert "_pendingSessionListPayload={gen:_gen,sessData,projData};" in refresh_block + assert "_schedulePendingSessionListApply();" in refresh_block + assert "_applySessionListPayload(sessData,projData);" in refresh_block assert "_markPollingCompletionUnreadTransitions(_allSessions);" in apply_block, ( "deferring sidebar refreshes must preserve background-completion unread semantics" ) @@ -41,9 +43,9 @@ def test_polling_payloads_are_deferred_while_user_scrolls_sidebar(): def test_deferred_payloads_keep_generation_stale_response_guard(): schedule_apply_block = _block("function _schedulePendingSessionListApply", "function _applySessionListPayload") - render_block = _block("async function renderSessionList", "// ── Gateway session SSE") + refresh_block = _block("async function _runRenderSessionListRefresh", "async function _drainRenderSessionListQueue") - assert "if(!deferWhileInteracting) _pendingSessionListPayload=null;" in render_block, ( + assert "if(!deferWhileInteracting) _pendingSessionListPayload=null;" in refresh_block, ( "explicit/user-initiated refreshes must clear older deferred background payloads" ) assert "payload.gen!==_renderSessionListGen" in schedule_apply_block, ( diff --git a/tests/test_issue856_background_completion_unread.py b/tests/test_issue856_background_completion_unread.py index d6c11fe8b4..2a62e9359f 100644 --- a/tests/test_issue856_background_completion_unread.py +++ b/tests/test_issue856_background_completion_unread.py @@ -121,7 +121,9 @@ def test_polling_transition_marks_completion_unread_without_sse_done(): ) render_idx = SESSIONS_JS.find("async function renderSessionList") assert render_idx != -1, "renderSessionList not found" - render_block = SESSIONS_JS[render_idx:SESSIONS_JS.find("// ── Gateway session SSE", render_idx)] + refresh_idx = SESSIONS_JS.find("async function _runRenderSessionListRefresh") + assert refresh_idx != -1, "_runRenderSessionListRefresh not found" + refresh_block = SESSIONS_JS[refresh_idx:SESSIONS_JS.find("async function _drainRenderSessionListQueue", refresh_idx)] apply_idx = SESSIONS_JS.find("function _applySessionListPayload(") assert apply_idx != -1, "_applySessionListPayload not found" @@ -136,7 +138,7 @@ def test_polling_transition_marks_completion_unread_without_sse_done(): ) assert "_markSessionCompletionUnread(sid, s.message_count);" in transition_block assert "_sessionStreamingById.set(sid, isStreaming);" in transition_block - assert "_applySessionListPayload(sessData,projData);" in render_block + assert "_applySessionListPayload(sessData,projData);" in refresh_block assert "_markPollingCompletionUnreadTransitions(_allSessions);" in apply_block diff --git a/tests/test_live_activity_timeline.py b/tests/test_live_activity_timeline.py index 21e04f2ca1..d1205ffa7f 100644 --- a/tests/test_live_activity_timeline.py +++ b/tests/test_live_activity_timeline.py @@ -10,6 +10,7 @@ REPO = pathlib.Path(__file__).parent.parent UI_JS = (REPO / "static" / "ui.js").read_text(encoding="utf-8") +MESSAGES_JS = (REPO / "static" / "messages.js").read_text(encoding="utf-8") STYLE_CSS = (REPO / "static" / "style.css").read_text(encoding="utf-8") @@ -23,12 +24,27 @@ def test_live_activity_group_has_observable_baseline_events(): def test_empty_thinking_placeholder_becomes_status_row_not_raw_thinking_card(): assert "data-activity-event-id=\"thinking-placeholder\"" in UI_JS + assert "Starting agent" in UI_JS + assert "Creating the stream and sending your message…" in UI_JS + assert "Waiting for first model token" in UI_JS + assert "Stream connected; no model output has arrived yet." in UI_JS assert "Waiting on model" in UI_JS - assert "No tool activity has been reported yet." in UI_JS + assert "Tool finished; waiting for the model to continue." in UI_JS assert "Waiting on tool result" in UI_JS + assert "The tool is still running; the response will continue after it completes." in UI_JS assert "_thinkingActivityNode(thinkingText, false)" in UI_JS +def test_stream_start_refreshes_waiting_status_after_stream_id_arrives(): + active_idx = MESSAGES_JS.find("S.activeStreamId = streamId;") + assert active_idx != -1 + refresh_idx = MESSAGES_JS.find("appendThinking('',{pending:true})", active_idx) + attach_idx = MESSAGES_JS.find("attachLiveStream(activeSid, streamId, uploadedNames);", active_idx) + assert refresh_idx != -1 + assert attach_idx != -1 + assert refresh_idx < attach_idx + + def test_tool_events_update_activity_timeline_and_summary(): assert "Tool finished: ${toolName}" in UI_JS assert "Running tool: ${toolName}" in UI_JS diff --git a/tests/test_performance_polling_hardening.py b/tests/test_performance_polling_hardening.py new file mode 100644 index 0000000000..a79666a1fa --- /dev/null +++ b/tests/test_performance_polling_hardening.py @@ -0,0 +1,43 @@ +"""Static regressions for frontend passive polling hardening.""" + +from __future__ import annotations + +from pathlib import Path + +ROOT = Path(__file__).resolve().parents[1] +SESSIONS_JS = ROOT / "static" / "sessions.js" +MESSAGES_JS = ROOT / "static" / "messages.js" + + +def _source(path: Path) -> str: + return path.read_text(encoding="utf-8") + + +def test_session_list_refreshes_are_coalesced_while_in_flight(): + src = _source(SESSIONS_JS) + assert "let _renderSessionListInFlight = null" in src + assert "let _renderSessionListQueuedRequest = null" in src + assert "async function _runRenderSessionListRefresh" in src + assert "async function _drainRenderSessionListQueue" in src + assert "const request={opts:opts||{},gen:++_renderSessionListGen}" in src + assert "if(_renderSessionListInFlight)" in src + assert "_renderSessionListQueuedRequest={" in src + assert "opts:_mergeRenderSessionListOptions" in src + assert "if (_gen !== _renderSessionListGen) return" in src + assert "api('/api/sessions' + allProfilesQS,{timeoutToast:false})" in src + assert "api('/api/projects' + allProfilesQS,{timeoutToast:false})" in src + + +def test_approval_and_clarify_fallback_polls_do_not_overlap(): + src = _source(MESSAGES_JS) + assert "let _approvalFallbackPollInFlight = false" in src + assert "if (_approvalFallbackPollInFlight) return" in src + assert "_approvalFallbackPollInFlight = true" in src + assert "finally { _approvalFallbackPollInFlight = false; }" in src + assert "_approvalFallbackPollInFlight = false;\n _approvalPollingSessionId = null;" in src + + assert "let _clarifyFallbackPollInFlight = false" in src + assert "if (_clarifyFallbackPollInFlight) return" in src + assert "_clarifyFallbackPollInFlight = true" in src + assert "finally {\n _clarifyFallbackPollInFlight = false;\n }" in src + assert "_clarifyFallbackPollInFlight = false;\n _clarifyPollingSessionId = null;" in src diff --git a/tests/test_stage326_composer_draft_validation.py b/tests/test_stage326_composer_draft_validation.py index af9c0cac5f..04cbe95911 100644 --- a/tests/test_stage326_composer_draft_validation.py +++ b/tests/test_stage326_composer_draft_validation.py @@ -81,7 +81,7 @@ def test_draft_validation_appears_before_persist(): src = Path(__file__).parents[1].joinpath("api", "routes.py").read_text(encoding="utf-8") # Anchor on the unique POST-validation comment marker. marker_idx = src.find("Stage-326 hardening (per Opus advisor)") - persist_idx = src.find("s.composer_draft = draft\n # Draft persistence is not conversation activity") + persist_idx = src.find("s.composer_draft = next_draft\n # Draft persistence is not conversation activity") assert marker_idx != -1 and persist_idx != -1, ( "could not locate validation marker or persist site" ) @@ -98,7 +98,21 @@ def test_draft_save_does_not_touch_session_updated_at(): update and force-reloads the current chat a few seconds later. """ src = Path(__file__).parents[1].joinpath("api", "routes.py").read_text(encoding="utf-8") - persist_idx = src.find("s.composer_draft = draft") + persist_idx = src.find("s.composer_draft = next_draft") assert persist_idx != -1, "could not locate composer draft persist site" save_idx = src.find("s.save(touch_updated_at=False, skip_index=True)", persist_idx) assert save_idx != -1, "composer draft save must preserve session updated_at and skip index churn" + + +def test_draft_save_skips_unchanged_payload_before_persist(): + """Duplicate debounced draft POSTs should not rewrite the full session JSON.""" + src = Path(__file__).parents[1].joinpath("api", "routes.py").read_text(encoding="utf-8") + draft_idx = src.find('current_draft = dict(getattr(s, "composer_draft", {}) or {})') + unchanged_idx = src.find("if next_draft == current_draft", draft_idx) + save_idx = src.find("s.save(touch_updated_at=False, skip_index=True)", draft_idx) + + assert draft_idx != -1, "draft route should snapshot current composer_draft" + assert unchanged_idx != -1, "draft route should no-op unchanged normalized payloads" + assert save_idx != -1, "draft route should still save changed drafts" + assert unchanged_idx < save_idx, "unchanged guard must run before full session save" + assert 'payload["unchanged"] = True' in src diff --git a/tests/test_update_banner_fixes.py b/tests/test_update_banner_fixes.py index c9473ba07f..6855ad6557 100644 --- a/tests/test_update_banner_fixes.py +++ b/tests/test_update_banner_fixes.py @@ -426,6 +426,90 @@ def test_force_update_refuses_when_stream_active(self, tmp_path, monkeypatch): assert result.get('restart_blocked') is True assert 'active chat stream' in result['message'] + def test_apply_update_refuses_when_active_run_without_stream(self, tmp_path, monkeypatch): + import api.updates as upd + from api.config import ACTIVE_RUNS, ACTIVE_RUNS_LOCK, STREAMS, STREAMS_LOCK + + (tmp_path / '.git').mkdir() + monkeypatch.setattr(upd, 'REPO_ROOT', tmp_path) + monkeypatch.setattr(upd, '_AGENT_DIR', tmp_path) + called = [] + monkeypatch.setattr(upd, '_run_git', lambda *a, **k: (called.append(a) or ('', True))) + monkeypatch.setattr(upd, '_schedule_restart', lambda delay=2.0: (_ for _ in ()).throw(AssertionError('must not restart'))) + + with STREAMS_LOCK: + old_streams = dict(STREAMS) + STREAMS.clear() + with ACTIVE_RUNS_LOCK: + old_runs = dict(ACTIVE_RUNS) + ACTIVE_RUNS.clear() + ACTIVE_RUNS['run_active'] = {'session_id': 's1', 'stream_id': 'missing-stream'} + try: + result = upd.apply_update('webui') + finally: + with ACTIVE_RUNS_LOCK: + ACTIVE_RUNS.clear() + ACTIVE_RUNS.update(old_runs) + with STREAMS_LOCK: + STREAMS.clear() + STREAMS.update(old_streams) + + assert result['ok'] is False + assert result.get('active_streams') == 0 + assert result.get('active_runs') == 1 + assert result.get('restart_blocked') is True + assert 'active agent run' in result['message'] + assert called == [] + + def test_force_update_refuses_when_active_run_without_stream(self, tmp_path, monkeypatch): + import api.updates as upd + from api.config import ACTIVE_RUNS, ACTIVE_RUNS_LOCK, STREAMS, STREAMS_LOCK + + (tmp_path / '.git').mkdir() + monkeypatch.setattr(upd, 'REPO_ROOT', tmp_path) + monkeypatch.setattr(upd, '_AGENT_DIR', tmp_path) + monkeypatch.setattr(upd, '_run_git', lambda *a, **k: (_ for _ in ()).throw(AssertionError('must not run git'))) + monkeypatch.setattr(upd, '_schedule_restart', lambda delay=2.0: (_ for _ in ()).throw(AssertionError('must not restart'))) + + with STREAMS_LOCK: + old_streams = dict(STREAMS) + STREAMS.clear() + with ACTIVE_RUNS_LOCK: + old_runs = dict(ACTIVE_RUNS) + ACTIVE_RUNS.clear() + ACTIVE_RUNS['run_active'] = {'session_id': 's1', 'stream_id': 'missing-stream'} + try: + result = upd.apply_force_update('agent') + finally: + with ACTIVE_RUNS_LOCK: + ACTIVE_RUNS.clear() + ACTIVE_RUNS.update(old_runs) + with STREAMS_LOCK: + STREAMS.clear() + STREAMS.update(old_streams) + + assert result['ok'] is False + assert result.get('active_streams') == 0 + assert result.get('active_runs') == 1 + assert result.get('restart_blocked') is True + assert 'active agent run' in result['message'] + + def test_wait_until_restart_safe_waits_for_active_run_to_clear(self, monkeypatch): + import api.updates as upd + + snapshots = [ + {'restart_blocked': True, 'active_streams': 0, 'active_runs': 1}, + {'restart_blocked': False, 'active_streams': 0, 'active_runs': 0}, + ] + sleeps = [] + monkeypatch.setattr(upd, '_restart_blocker_snapshot', lambda: snapshots.pop(0)) + monkeypatch.setattr(upd.time, 'sleep', lambda seconds: sleeps.append(seconds)) + + result = upd._wait_until_restart_safe(poll_seconds=0.25) + + assert result['restart_blocked'] is False + assert sleeps == [0.25] + class TestSuccessfulUpdateReturnsRestartScheduled: """#814 — successful apply_update must return restart_scheduled: True.""" diff --git a/tests/test_updates.py b/tests/test_updates.py index 71792c4438..793fd61ca6 100644 --- a/tests/test_updates.py +++ b/tests/test_updates.py @@ -231,7 +231,7 @@ def fake_git(args, cwd, timeout=10): with patch.object(updates, '_run_git', side_effect=fake_git), \ patch.object(updates, 'REPO_ROOT', tmp_path), \ - patch.object(updates, '_active_stream_count', return_value=0): + patch.object(updates, '_restart_blocker_snapshot', return_value={'restart_blocked': False, 'active_streams': 0, 'active_runs': 0}): updates.apply_force_update('webui') fetch_calls = [a for a in seen_args if a[:2] == ['fetch', 'origin']] @@ -256,7 +256,7 @@ def fake_git(args, cwd, timeout=10): with patch.object(updates, '_run_git', side_effect=fake_git), \ patch.object(updates, 'REPO_ROOT', tmp_path), \ - patch.object(updates, '_active_stream_count', return_value=0): + patch.object(updates, '_restart_blocker_snapshot', return_value={'restart_blocked': False, 'active_streams': 0, 'active_runs': 0}): updates.apply_update('webui') fetch_calls = [a for a in seen_args if a[:2] == ['fetch', 'origin']] From 694fdd1096e6a4164f114245587b4b7d4364db12 Mon Sep 17 00:00:00 2001 From: nesquena-hermes <[email protected]> Date: Sat, 30 May 2026 01:53:38 +0000 Subject: [PATCH 264/349] =?UTF-8?q?review-3105:=20bound=20=5Fwait=5Funtil?= =?UTF-8?q?=5Frestart=5Fsafe=20with=20300s=20max-wait=20+=20execv=20fallba?= =?UTF-8?q?ck=20(Opus=20review=20=E2=80=94=20avoid=20self-update=20soft-ja?= =?UTF-8?q?m=20on=20long=20runs)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/updates.py | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/api/updates.py b/api/updates.py index da207a3255..2db8269fe7 100644 --- a/api/updates.py +++ b/api/updates.py @@ -10,6 +10,7 @@ """ import hashlib import json +import logging import os import re import subprocess @@ -23,6 +24,8 @@ from api.config import REPO_ROOT, STREAMS, STREAMS_LOCK +logger = logging.getLogger(__name__) + # Lazy -- may be None if agent not found try: from api.config import _AGENT_DIR @@ -126,10 +129,28 @@ def _restart_blocked_response(target: str, blocker_snapshot: dict | int) -> dict } -def _wait_until_restart_safe(poll_seconds: float = 2.0) -> dict: - """Wait for active work to finish before self-reexec.""" +def _wait_until_restart_safe(poll_seconds: float = 2.0, max_wait_seconds: float = 300.0) -> dict: + """Wait for active work to finish before self-reexec. + + Bounded by ``max_wait_seconds`` so a long-running (or stuck/orphaned) agent + run can't soft-jam the self-update indefinitely. If the deadline is reached + while work is still in flight, the snapshot is returned with + ``wait_timed_out=True`` so the caller can proceed with the re-exec anyway + (preserving the pre-#3105 "execv preempts in-flight work" fallback) rather + than holding ``_apply_lock`` for the run's full lifetime. + """ snapshot = _restart_blocker_snapshot() + deadline = time.monotonic() + max(0.0, max_wait_seconds) while snapshot.get('restart_blocked'): + if time.monotonic() >= deadline: + logger.warning( + "restart-safety wait exceeded %.0fs with work still in flight (%s); " + "proceeding with re-exec anyway", + max_wait_seconds, snapshot, + ) + snapshot = dict(snapshot) + snapshot['wait_timed_out'] = True + return snapshot time.sleep(max(0.1, poll_seconds)) snapshot = _restart_blocker_snapshot() return snapshot From a7848c884e835bc63f9c75609fc81dfd8bf22133 Mon Sep 17 00:00:00 2001 From: nesquena-hermes <[email protected]> Date: Sat, 30 May 2026 01:54:52 +0000 Subject: [PATCH 265/349] stage-batch46: CHANGELOG for v0.51.164 (Release EJ) --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05418d4399..72c3b37067 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,14 @@ ## [Unreleased] +## [v0.51.164] — 2026-05-30 — Release EJ (stage-batch46 — passive performance hardening: refresh coalescing + draft-save dedup + activity placeholders + bounded restart-safety wait) + ### Fixed - Coalesced duplicate in-flight sidebar/project refreshes and suppressed overlapping approval/clarify fallback polls, reducing repeated passive requests while preserving latest-refresh-wins sidebar state. - Skipped duplicate composer-draft writes when the normalized autosave payload is unchanged, avoiding redundant full session JSON rewrites during debounced input/focus churn. - Refined empty Activity waiting placeholders to distinguish stream creation, first-token wait, post-tool model wait, and running-tool wait states. -- Self-update restart safety now checks active agent runs as well as open SSE streams and waits for in-flight work before re-exec, avoiding update-triggered interruption when a run outlives its browser stream. +- Self-update restart safety now checks active agent runs as well as open SSE streams and waits for in-flight work before re-exec, avoiding update-triggered interruption when a run outlives its browser stream. The wait is bounded (300s) with a logged fallback to re-exec so a long-running or stuck agent run cannot soft-jam the self-update indefinitely. - Documented the WebUI prefill context budget in README and architecture notes so operators can keep new-browser-turn startup context compact. ## [v0.51.163] — 2026-05-30 — Release EI (stage-batch45 — session duplicate/branch field propagation) From ab4de3bb64961287bba5c188fd7dc6c1abfe2859 Mon Sep 17 00:00:00 2001 From: Sanjays2402 <51058514+Sanjays2402@users.noreply.github.com> Date: Fri, 29 May 2026 03:25:31 -0700 Subject: [PATCH 266/349] Fix #3103: stop emitting Connection: close on long-lived SSE streams The gateway SSE handler (`_handle_gateway_sse_stream`) and session-events SSE handler (`_handle_session_events_stream`) both set `Connection: close` on the response. On long-lived SSE streams, browsers (Chrome, Firefox, Safari) interpret that header as 'this is a one-shot response, the EventSource lifecycle is over the moment the body ends' and trigger an immediate reconnect when the server-side worker rotates. The result, with EventSource's auto-reconnect on top, is a tight loop of connect -> sessions_changed snapshot -> reconnect every ~1s that pegs the worker, thrashes the session list, and prevents the in-app session list from ever settling. Removing the header lets the python BaseHTTPServer close the socket naturally after the stream ends, which is what EventSource expects. Regression introduced in 598fd4ff. --- api/routes.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/api/routes.py b/api/routes.py index 71f29dad35..70f96eb638 100644 --- a/api/routes.py +++ b/api/routes.py @@ -7559,7 +7559,14 @@ def _handle_gateway_sse_stream(handler, parsed): handler.send_header('Content-Type', 'text/event-stream; charset=utf-8') handler.send_header('Cache-Control', 'no-cache') handler.send_header('X-Accel-Buffering', 'no') - handler.send_header('Connection', 'close') + # #3103: do NOT emit `Connection: close` on long-lived SSE streams. + # The python BaseHTTPServer worker only handles one request per + # connection anyway, but browsers (Chrome/Firefox) treat the close + # header as a hard signal that the EventSource lifecycle has ended + # and trigger an instant reconnect, producing a tight loop of + # connect/sessions_changed snapshot/disconnect that thrashes the + # session list every ~1s. Letting the server close the socket + # naturally after the stream ends is sufficient. handler.end_headers() q = watcher.subscribe() @@ -7592,7 +7599,8 @@ def _handle_session_events_stream(handler): handler.send_header('Content-Type', 'text/event-stream; charset=utf-8') handler.send_header('Cache-Control', 'no-cache') handler.send_header('X-Accel-Buffering', 'no') - handler.send_header('Connection', 'close') + # #3103: see _handle_gateway_sse_stream — `Connection: close` causes + # EventSource reconnect storms in browsers on long-lived SSE. handler.end_headers() q = subscribe_session_events() From 2fc692f68bafa15338a1a5b289442635df6d7a6b Mon Sep 17 00:00:00 2001 From: nesquena-hermes <[email protected]> Date: Sat, 30 May 2026 02:08:37 +0000 Subject: [PATCH 267/349] =?UTF-8?q?test:=20pin=20#3103=20=E2=80=94=20SSE?= =?UTF-8?q?=20event-stream=20handlers=20must=20not=20emit=20Connection:=20?= =?UTF-8?q?close=20(keep=20it=20for=20finite=20responses)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test_issue3103_sse_no_connection_close.py | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 tests/test_issue3103_sse_no_connection_close.py diff --git a/tests/test_issue3103_sse_no_connection_close.py b/tests/test_issue3103_sse_no_connection_close.py new file mode 100644 index 0000000000..1fcd86cce2 --- /dev/null +++ b/tests/test_issue3103_sse_no_connection_close.py @@ -0,0 +1,60 @@ +"""Regression test for #3103 / PR #3128. + +Commit 598fd4ff added `Connection: close` to the two long-lived SSE handlers +(`_handle_gateway_sse_stream`, `_handle_session_events_stream`). Browsers treat +`Connection: close` on an SSE response as a signal that the EventSource lifecycle +has ended and auto-reconnect, producing a reconnect storm that thrashes the +session list (#3103). These handlers must NOT emit `Connection: close`. + +Finite responses (the on-the-fly ZIP download, terminal SSE, etc.) still need the +header for unambiguous HTTP/1.1 message boundaries — this test only pins the two +long-lived session/gateway event streams. +""" + +import re +from pathlib import Path + +ROUTES = (Path(__file__).resolve().parents[1] / "api" / "routes.py").read_text(encoding="utf-8") + + +def _handler_body(name: str) -> str: + """Return the source of a handler function from its `def` to the next top-level `def`.""" + start = ROUTES.index(f"def {name}(") + # find the next top-level "def " after the function start + nxt = ROUTES.find("\ndef ", start + 1) + return ROUTES[start: nxt if nxt != -1 else len(ROUTES)] + + +def _emits_connection_close(body: str) -> bool: + """True if the handler actually CALLS send_header to emit Connection: close + (ignores mentions in comments).""" + return bool( + re.search(r"send_header\(\s*['\"]Connection['\"]\s*,\s*['\"]close['\"]", body) + ) + + +def test_session_events_stream_does_not_emit_connection_close(): + body = _handler_body("_handle_session_events_stream") + assert "text/event-stream" in body, "sanity: this is the SSE handler" + assert not _emits_connection_close(body), ( + "_handle_session_events_stream must not emit `Connection: close` — it triggers " + "browser EventSource reconnect storms on this long-lived stream (#3103)" + ) + + +def test_gateway_sse_stream_does_not_emit_connection_close(): + body = _handler_body("_handle_gateway_sse_stream") + assert "text/event-stream" in body, "sanity: this is the SSE handler" + assert not _emits_connection_close(body), ( + "_handle_gateway_sse_stream must not emit `Connection: close` — it triggers " + "browser EventSource reconnect storms on this long-lived stream (#3103)" + ) + + +def test_connection_close_still_present_for_finite_zip_download(): + """The on-the-fly ZIP download (no Content-Length) still needs Connection: close + for unambiguous HTTP/1.1 framing (#2836). Guard against an over-broad removal.""" + assert ROUTES.count('"Connection", "close"') + ROUTES.count("'Connection', 'close'") >= 1, ( + "at least the finite-response handlers (ZIP download, etc.) must keep " + "`Connection: close` for HTTP/1.1 message-boundary correctness (#2836)" + ) From 5f0d7534db0af22a7278dbb2ed5c32e945ff2b4a Mon Sep 17 00:00:00 2001 From: nesquena-hermes <[email protected]> Date: Sat, 30 May 2026 02:09:01 +0000 Subject: [PATCH 268/349] stage-batch47: CHANGELOG for v0.51.165 (Release EK) --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72c3b37067..346995be1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ ## [Unreleased] +## [v0.51.165] — 2026-05-30 — Release EK (stage-batch47 — stop EventSource reconnect storm on long-lived SSE streams) + +### Fixed + +- The session-events and gateway SSE streams no longer emit `Connection: close`, which browsers interpreted as a signal that the EventSource lifecycle had ended — triggering an instant reconnect loop that thrashed the session list roughly once per second and forced repeated re-renders / scroll-to-bottom (#3103, regression from the HTTP/1.1 keep-alive change in 598fd4ff). Finite responses that lack a `Content-Length` (e.g. the on-the-fly workspace ZIP download) keep `Connection: close` for unambiguous HTTP/1.1 message framing. + ## [v0.51.164] — 2026-05-30 — Release EJ (stage-batch46 — passive performance hardening: refresh coalescing + draft-save dedup + activity placeholders + bounded restart-safety wait) ### Fixed From d2686eaedb4373a3ac83a495b5b6d9e813a8acfd Mon Sep 17 00:00:00 2001 From: AJV20 <24819659+AJV20@users.noreply.github.com> Date: Fri, 29 May 2026 21:53:17 -0400 Subject: [PATCH 269/349] fix: honor shared OpenCode key at runtime --- CHANGELOG.md | 4 ++ api/providers.py | 6 ++ ...t_issue3145_opencode_shared_runtime_key.py | 56 +++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 tests/test_issue3145_opencode_shared_runtime_key.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 346995be1f..41c20b9d3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ ## [Unreleased] +### Fixed + +- OpenCode provider key lookup now honors the shared `OPENCODE_API_KEY` fallback for both Zen and Go runtime paths, matching model-picker detection when provider-specific keys are absent (#3145). + ## [v0.51.165] — 2026-05-30 — Release EK (stage-batch47 — stop EventSource reconnect storm on long-lived SSE streams) ### Fixed diff --git a/api/providers.py b/api/providers.py index 200000d5fa..77b9c718e1 100644 --- a/api/providers.py +++ b/api/providers.py @@ -682,6 +682,12 @@ def _fetch_codex_account_usage_from_pool(): # #1500 — agent runtime reads LM_API_KEY (canonical), but WebUI builds # ≤ v0.50.272 wrote LMSTUDIO_API_KEY into .env. Keep reading both. "lmstudio": ("LMSTUDIO_API_KEY",), + # #3145 — provider detection treats OPENCODE_API_KEY as enabling both + # OpenCode Zen and OpenCode Go. The runtime-facing lookup must read the same + # shared bridge key after the provider-specific slot, otherwise Settings can + # show the groups as configured while chat fails the no-key path. + "opencode-zen": ("OPENCODE_API_KEY",), + "opencode-go": ("OPENCODE_API_KEY",), } # Providers that use OAuth or token flows — their credentials are managed diff --git a/tests/test_issue3145_opencode_shared_runtime_key.py b/tests/test_issue3145_opencode_shared_runtime_key.py new file mode 100644 index 0000000000..34875cdb3b --- /dev/null +++ b/tests/test_issue3145_opencode_shared_runtime_key.py @@ -0,0 +1,56 @@ +"""Regression tests for shared OpenCode API key runtime lookup (#3145).""" + +import pytest + + +@pytest.mark.parametrize("provider_id", ["opencode-zen", "opencode-go"]) +def test_shared_opencode_api_key_resolves_for_runtime(monkeypatch, tmp_path, provider_id): + """Runtime-facing key lookup should honor OPENCODE_API_KEY for both groups.""" + import api.providers as providers + + hermes_home = tmp_path / "hermes-home" + hermes_home.mkdir() + (hermes_home / ".env").write_text("OPENCODE_API_KEY=shared-opencode-key\n", encoding="utf-8") + + monkeypatch.setattr(providers, "_get_hermes_home", lambda: hermes_home) + monkeypatch.delenv("OPENCODE_ZEN_API_KEY", raising=False) + monkeypatch.delenv("OPENCODE_GO_API_KEY", raising=False) + monkeypatch.delenv("OPENCODE_API_KEY", raising=False) + + assert providers._provider_has_key(provider_id) is True + assert providers._get_provider_api_key(provider_id) == "shared-opencode-key" + + +@pytest.mark.parametrize("provider_id", ["opencode-zen", "opencode-go"]) +def test_shared_opencode_api_key_resolves_from_process_env(monkeypatch, tmp_path, provider_id): + """The shared env var should work even when no .env file exists.""" + import api.providers as providers + + monkeypatch.setattr(providers, "_get_hermes_home", lambda: tmp_path / "missing-home") + monkeypatch.delenv("OPENCODE_ZEN_API_KEY", raising=False) + monkeypatch.delenv("OPENCODE_GO_API_KEY", raising=False) + monkeypatch.setenv("OPENCODE_API_KEY", "shared-env-opencode-key") + + assert providers._provider_has_key(provider_id) is True + assert providers._get_provider_api_key(provider_id) == "shared-env-opencode-key" + + +def test_provider_specific_opencode_key_still_wins_over_shared(monkeypatch, tmp_path): + """Provider-specific env vars keep precedence over the shared fallback.""" + import api.providers as providers + + hermes_home = tmp_path / "hermes-home" + hermes_home.mkdir() + (hermes_home / ".env").write_text( + "OPENCODE_API_KEY=shared-opencode-key\n" + "OPENCODE_ZEN_API_KEY=zen-specific-key\n", + encoding="utf-8", + ) + + monkeypatch.setattr(providers, "_get_hermes_home", lambda: hermes_home) + monkeypatch.delenv("OPENCODE_API_KEY", raising=False) + monkeypatch.delenv("OPENCODE_ZEN_API_KEY", raising=False) + monkeypatch.delenv("OPENCODE_GO_API_KEY", raising=False) + + assert providers._get_provider_api_key("opencode-zen") == "zen-specific-key" + assert providers._get_provider_api_key("opencode-go") == "shared-opencode-key" From e68c670bbac8497fa1e38bc86963fbb98dc840dd Mon Sep 17 00:00:00 2001 From: AJV20 <24819659+AJV20@users.noreply.github.com> Date: Fri, 29 May 2026 21:59:22 -0400 Subject: [PATCH 270/349] fix: keep agent cron sessions in project chips --- CHANGELOG.md | 4 ++ api/routes.py | 32 +++++++++--- tests/test_gateway_sync.py | 6 ++- tests/test_issue3019_cron_project_sessions.py | 50 +++++++++++++++++++ 4 files changed, 83 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 346995be1f..59adee7f30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ ## [Unreleased] +### Fixed + +- Agent-side cron sessions imported from state.db now remain available to their assigned project chip as `default_hidden` rows instead of being filtered out before project reveal logic can see them (#3134). + ## [v0.51.165] — 2026-05-30 — Release EK (stage-batch47 — stop EventSource reconnect storm on long-lived SSE streams) ### Fixed diff --git a/api/routes.py b/api/routes.py index 70f96eb638..cc8bd761d1 100644 --- a/api/routes.py +++ b/api/routes.py @@ -2530,6 +2530,29 @@ def _is_duplicate_webui_state_projection(session: dict, represented_webui_ids: s return bool(_session_lineage_ids(session) & represented_webui_ids) +def _dedupe_cli_sidebar_sessions_for_api(cli: list[dict], represented_webui_ids: set[str]) -> list[dict]: + """Return CLI/state sidebar rows while preserving project-hidden cron rows. + + Agent-side cron sessions come from state.db rather than the WebUI session + store. They should stay hidden from the default sidebar, but project-assigned + messageful rows must remain in the `/api/sessions` payload with + `default_hidden` so the matching project chip can reveal them (#3134). + """ + from api.models import ( + _hide_from_default_sidebar as _cron_hide, + _include_project_hidden_background_sidebar_sessions, + ) + + candidates = [ + s for s in cli + if s["session_id"] not in represented_webui_ids + and not _is_duplicate_webui_state_projection(s, represented_webui_ids) + and is_cli_session_row_visible(s) + ] + visible = [s for s in candidates if not _cron_hide(s)] + return _include_project_hidden_background_sidebar_sessions(candidates, visible) + + CLI_VISIBLE_SESSION_CAP = 20 @@ -4625,14 +4648,7 @@ def handle_get(handler, parsed) -> bool: represented_webui_ids = set() for s in webui_sessions: represented_webui_ids.update(_session_lineage_ids(s)) - from api.models import _hide_from_default_sidebar as _cron_hide - deduped_cli = [ - s for s in cli - if s["session_id"] not in represented_webui_ids - and not _is_duplicate_webui_state_projection(s, represented_webui_ids) - and is_cli_session_row_visible(s) - and not _cron_hide(s) - ] + deduped_cli = _dedupe_cli_sidebar_sessions_for_api(cli, represented_webui_ids) else: diag.stage("filter_webui_sessions") webui_sessions = [s for s in webui_sessions if not _is_cli_session_for_settings(s)] diff --git a/tests/test_gateway_sync.py b/tests/test_gateway_sync.py index 7181972d07..5cd3fb92a1 100644 --- a/tests/test_gateway_sync.py +++ b/tests/test_gateway_sync.py @@ -1529,7 +1529,11 @@ def test_cron_sessions_hidden_from_sidebar_by_default(): sessions = data.get('sessions', []) ids = {s['session_id'] for s in sessions} assert 'gw_noncron_001' in ids, "Non-cron agent session should still appear" - assert 'cron_job123_20260427' not in ids, "Cron session should be hidden by default" + cron_row = next((s for s in sessions if s['session_id'] == 'cron_job123_20260427'), None) + assert cron_row is None or cron_row.get('default_hidden') is True, ( + "Cron session should either be omitted from /api/sessions or marked " + "default_hidden so the default sidebar filter keeps it hidden" + ) finally: try: _remove_test_sessions(conn, 'cron_job123_20260427', 'gw_noncron_001') diff --git a/tests/test_issue3019_cron_project_sessions.py b/tests/test_issue3019_cron_project_sessions.py index bd27157fad..dd112b4b90 100644 --- a/tests/test_issue3019_cron_project_sessions.py +++ b/tests/test_issue3019_cron_project_sessions.py @@ -38,6 +38,56 @@ def test_project_assigned_cron_rows_are_returned_but_default_hidden(): assert by_id["cron_visible"]["default_hidden"] is True +def test_agent_side_cron_rows_keep_project_chip_visibility(): + from api.routes import _dedupe_cli_sidebar_sessions_for_api + + represented_webui_ids = {"webui-1"} + cli_rows = [ + { + "session_id": "cli-normal", + "source_tag": "cli", + "title": "Manual deployment notes", + "message_count": 1, + "updated_at": 5, + }, + { + "session_id": "cron-agent-project", + "source_tag": "cron", + "title": "Cron agent run", + "message_count": 3, + "project_id": "cron-project", + "updated_at": 4, + }, + { + "session_id": "cron-agent-unassigned", + "source_tag": "cron", + "title": "Cron hidden", + "message_count": 3, + "updated_at": 3, + }, + { + "session_id": "cron-agent-empty", + "source_tag": "cron", + "title": "Cron empty", + "message_count": 0, + "project_id": "cron-project", + "updated_at": 2, + }, + { + "session_id": "webui-1", + "source_tag": "cli", + "title": "Duplicate imported copy", + "message_count": 1, + }, + ] + + rows = _dedupe_cli_sidebar_sessions_for_api(cli_rows, represented_webui_ids) + + by_id = {row["session_id"]: row for row in rows} + assert set(by_id) == {"cli-normal", "cron-agent-project"} + assert by_id["cron-agent-project"]["default_hidden"] is True + + def test_session_list_project_filter_can_reveal_default_hidden_cron_rows(): src = ( __import__("pathlib").Path(__file__).parent.parent / "static" / "sessions.js").read_text(encoding="utf-8") From 67028055270a65155071d2644a0c8334c9069089 Mon Sep 17 00:00:00 2001 From: nesquena-hermes <[email protected]> Date: Sat, 30 May 2026 02:57:02 +0000 Subject: [PATCH 271/349] stage-batch49: CHANGELOG for v0.51.167 (Release EM) --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f49149575e..813ac5c3f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ ## [Unreleased] +## [v0.51.167] — 2026-05-30 — Release EM (stage-batch49 — iOS-style swipe actions for touch devices + session-list FLIP reflow) + +### Added + +- Touch devices now support iOS-mail-style swipe actions on session rows: swipe left to reveal a Delete action, swipe right to reveal Archive (Restore for already-archived sessions). Swipe is gated to touch/coarse-pointer input, so desktop click, context-menu, and drag behavior are unchanged. Delete still routes through the existing confirmation dialog. The session list also gains FLIP-based reflow animation when rows are archived, deleted, or reordered, honoring `prefers-reduced-motion`. + ## [v0.51.166] — 2026-05-30 — Release EL (stage-batch48 — shared OpenCode runtime key + cron project-chip sessions) ### Fixed From e5b31caee12f5f9378da7fb90e82177f3a58f0cd Mon Sep 17 00:00:00 2001 From: nesquena-hermes <[email protected]> Date: Sat, 30 May 2026 03:24:41 +0000 Subject: [PATCH 272/349] =?UTF-8?q?fix(#3162):=20const=E2=86=92let=20in=20?= =?UTF-8?q?=5FensureMessagesLoaded=20(brick-class=20mobile=20TypeError)=20?= =?UTF-8?q?+=20ESLint=20runtime-error=20guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The #3018 carry-forward reassigns msgs but it was declared const, throwing a TypeError that surfaced as 'Failed to load conversation messages' on every mobile message (v0.51.161-166). Change to let. Adds a static JS runtime-error lint guard (eslint.runtime-guard.config.mjs + tests/test_static_js_runtime_lint.py) using no-const-assign/no-import-assign — the exact class node --check and source-presence tests miss. Dev-only dependency; app stays pure Python + vanilla JS. --- .gitignore | 4 + CHANGELOG.md | 10 +++ TESTING.md | 31 +++++++ eslint.runtime-guard.config.mjs | 35 ++++++++ package.json | 12 +++ static/sessions.js | 8 +- .../test_issue3162_ensure_messages_loaded.py | 40 +++++++++ tests/test_static_js_runtime_lint.py | 82 +++++++++++++++++++ 8 files changed, 220 insertions(+), 2 deletions(-) create mode 100644 eslint.runtime-guard.config.mjs create mode 100644 package.json create mode 100644 tests/test_issue3162_ensure_messages_loaded.py create mode 100644 tests/test_static_js_runtime_lint.py diff --git a/.gitignore b/.gitignore index e0f68fbc71..0d26b7ad46 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,7 @@ graphify-out/ .graphify_uncached.txt .venv/ + +# Dev-only lint tooling (ESLint runtime-error guard) — see TESTING.md +node_modules/ +package-lock.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 813ac5c3f0..db1a99b569 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ ## [Unreleased] +## [v0.51.168] — 2026-05-30 — Release EN (stage-batch50 — hotfix: mobile "Failed to load conversation messages") + +### Fixed + +- Fixed a `TypeError` in `_ensureMessagesLoaded` that surfaced as a "Failed to load conversation messages" toast on mobile after most messages: a `const msgs` binding was reassigned by the #3018 ephemeral-field carry-forward (introduced v0.51.161), which throws at runtime. Changed to `let`. Mobile triggered it most because SSE/visibility events fire the session-reload path more aggressively (#3162). + +### Added + +- Static JS runtime-error lint guard (`eslint.runtime-guard.config.mjs` + `tests/test_static_js_runtime_lint.py`): a curated, zero-false-positive ESLint check (`no-const-assign`, `no-import-assign`) over `static/**/*.js` that catches the brick-class of runtime errors `node --check` and source-presence tests miss. Runs in the test suite when ESLint is present and skips gracefully otherwise. See `TESTING.md` > "Static JS runtime lint". + ## [v0.51.167] — 2026-05-30 — Release EM (stage-batch49 — iOS-style swipe actions for touch devices + session-list FLIP reflow) ### Added diff --git a/TESTING.md b/TESTING.md index 24c8c5469a..4cdb086fd6 100644 --- a/TESTING.md +++ b/TESTING.md @@ -15,6 +15,37 @@ --- +## Static JS runtime lint (brick-class regression guard) + +Some JS bugs throw a `TypeError`/`ReferenceError` only when a specific function +actually runs in the browser — `node --check` (lazy syntax check), source-presence +tests, and even executing the file all miss them. Issue **#3162** was exactly this: +a `const` binding reassigned inside `_ensureMessagesLoaded` bricked "load conversation +messages" on every mobile message (v0.51.161–166). + +The guard is a curated, zero-false-positive ESLint config (`eslint.runtime-guard.config.mjs`) +that runs ONLY runtime-error rules (`no-const-assign`, `no-import-assign`) over +`static/**/*.js`. It is NOT a style linter and has no formatting rules. + +```bash +# one-time dev setup (ESLint is a dev-only tool; the app stays pure Python + vanilla JS): +npm install --no-save --before= eslint # package-age guard +# run the guard: +npm run lint:runtime +# or directly: +npx eslint --no-config-lookup -c eslint.runtime-guard.config.mjs "static/**/*.js" +``` + +`tests/test_static_js_runtime_lint.py` runs this automatically when eslint is present +and **skips gracefully** (clear message) when it isn't — so environments without the +node toolchain aren't blocked, while the release gate (which installs eslint) enforces it. + +To widen the guard, fix the pre-existing intentional hits first (as of 2026-05-30: +`no-dupe-keys` ×92 i18n locale-fallback, `no-func-assign` ×2 panel override, +`no-redeclare` ×1) then promote the rule into the config. + +--- + ## How to Use This Document Each test has: diff --git a/eslint.runtime-guard.config.mjs b/eslint.runtime-guard.config.mjs new file mode 100644 index 0000000000..a750c6a74a --- /dev/null +++ b/eslint.runtime-guard.config.mjs @@ -0,0 +1,35 @@ +// ESLint flat config — runtime-error guard for the static JS bundle. +// +// Purpose: catch brick-class runtime errors that `node --check`, source-presence +// tests, and even executing the file all MISS, because the error only fires when a +// specific function actually runs in the browser. Canonical case: #3162 — a `const` +// binding reassigned inside `_ensureMessagesLoaded` threw a TypeError that bricked +// "load conversation messages" on every mobile message in v0.51.161-166. +// +// Scope discipline: ONLY rules that flag genuine "throws at runtime" bugs AND have +// ZERO hits on the current clean tree (so the gate is green today and only ever +// fails on a NEW regression). This is NOT a style linter. +// +// Deliberately EXCLUDED (verified to have pre-existing intentional hits 2026-05-30): +// - no-dupe-keys (92 hits): intentional i18n locale-fallback override pattern +// - no-func-assign (2 hits): switchPanel/switchSettingsSection override pattern +// - no-redeclare (1 hit): redeclared loop var in panels.js +// If those are cleaned up later, they can be promoted into this guard. +// +// Run: npx eslint -c eslint.runtime-guard.config.mjs "static/**/*.js" +// (tests/test_static_js_runtime_lint.py runs this automatically when eslint is present.) + +export default [ + // Bundled/minified third-party assets are ES modules and not ours to lint. + { ignores: ["**/vendor/**", "**/*.min.js"] }, + { + files: ["**/*.js"], + languageOptions: { ecmaVersion: "latest", sourceType: "script" }, + rules: { + // #3162: reassigning a `const` — runtime TypeError, only fires on execution. + "no-const-assign": "error", + // Assigning to an import binding — runtime TypeError. + "no-import-assign": "error", + }, + }, +]; diff --git a/package.json b/package.json new file mode 100644 index 0000000000..666960f11c --- /dev/null +++ b/package.json @@ -0,0 +1,12 @@ +{ + "name": "hermes-webui-devtools", + "version": "1.0.0", + "private": true, + "description": "Dev-only tooling for hermes-webui. NOT a build step — the app remains pure Python + vanilla JS with no bundler. The only dependency is ESLint, used solely as a runtime-error guard over static/*.js (catches brick-class bugs like #3162 const-reassignment that node --check and source-presence tests miss). See TESTING.md > 'Static JS runtime lint'.", + "scripts": { + "lint:runtime": "eslint --no-config-lookup -c eslint.runtime-guard.config.mjs \"static/**/*.js\"" + }, + "devDependencies": { + "eslint": "^10.4.0" + } +} diff --git a/static/sessions.js b/static/sessions.js index 7a4847974f..0c89c1dabe 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -1321,10 +1321,14 @@ async function _ensureMessagesLoaded(sid) { if (!data || !data.session) return; _messagesTruncated = !!data.session._messages_truncated; _oldestIdx = data.session._messages_offset || 0; - const msgs = (data.session.messages || []).filter(m => m && m.role); + // #3162: `msgs` is reassigned below by the #3018 ephemeral-field carry-forward, + // so it must be `let`, not `const`. The `const` form threw a TypeError inside + // _ensureMessagesLoaded() that surfaced as a "Failed to load conversation messages" + // toast on every mobile message (SSE/visibility events trigger this reload path + // more aggressively on mobile). + let msgs = (data.session.messages || []).filter(m => m && m.role); // Check for tool-call metadata on messages (for tool-call card rendering) const hasMessageToolMetadata = msgs.some(m => { - if (!m || m.role !== 'assistant') return false; const hasTc = Array.isArray(m.tool_calls) && m.tool_calls.length > 0; const hasTu = Array.isArray(m.content) && m.content.some(p => p && p.type === 'tool_use'); return hasTc || hasTu; diff --git a/tests/test_issue3162_ensure_messages_loaded.py b/tests/test_issue3162_ensure_messages_loaded.py new file mode 100644 index 0000000000..cb44a39433 --- /dev/null +++ b/tests/test_issue3162_ensure_messages_loaded.py @@ -0,0 +1,40 @@ +"""Regression test pinning the #3162 fix. + +#3162: `_ensureMessagesLoaded` in static/sessions.js declared `const msgs` but the +#3018 ephemeral-field carry-forward reassigns it (`msgs = window._carryForwardEphemeralTurnFields(...)`). +`const` -> runtime TypeError -> "Failed to load conversation messages" toast on every +mobile message (v0.51.161-166). Fix: `const` -> `let`. + +This is the targeted pin; tests/test_static_js_runtime_lint.py is the general guard. +""" +from pathlib import Path + +REPO = Path(__file__).resolve().parents[1] +SESSIONS_JS = (REPO / "static" / "sessions.js").read_text(encoding="utf-8") + + +def _ensure_messages_loaded_body() -> str: + start = SESSIONS_JS.index("async function _ensureMessagesLoaded") + return SESSIONS_JS[start: start + 2000] + + +def test_ensure_messages_loaded_declares_msgs_with_let(): + body = _ensure_messages_loaded_body() + assert "let msgs = (data.session.messages" in body, ( + "_ensureMessagesLoaded must declare `let msgs` — it is reassigned by the #3018 " + "carry-forward, and `const` throws a runtime TypeError on every mobile message (#3162)" + ) + assert "const msgs = (data.session.messages" not in body, ( + "found `const msgs` in _ensureMessagesLoaded — this is the #3162 brick-class bug; " + "must be `let` because msgs is reassigned" + ) + + +def test_ensure_messages_loaded_reassignment_still_present(): + """Keep this test meaningful: confirm the reassignment that requires `let` exists. + If the carry-forward is removed, revisit whether `let` is still needed.""" + body = _ensure_messages_loaded_body().replace(" ", "") + assert "msgs=window._carryForwardEphemeralTurnFields" in body, ( + "the #3018 carry-forward reassignment of msgs is gone — re-evaluate the let/const " + "decision in _ensureMessagesLoaded" + ) diff --git a/tests/test_static_js_runtime_lint.py b/tests/test_static_js_runtime_lint.py new file mode 100644 index 0000000000..eb2ab5223d --- /dev/null +++ b/tests/test_static_js_runtime_lint.py @@ -0,0 +1,82 @@ +"""Runtime-error lint guard for the static JS bundle (issue #3162). + +Why this exists: #3162 was a brick-class regression — a `const` binding reassigned +inside `_ensureMessagesLoaded` threw a `TypeError` that broke "load conversation +messages" on every mobile message (v0.51.161-166). Nothing caught it: +`node --check` is a lazy syntax check (misses const-assign), source-presence tests +asserted the strings existed, and even *running* the file doesn't compile an +uncalled function body. Only a real scope-aware linter (ESLint `no-const-assign`) +or executing the exact function would have flagged it. + +This test runs ESLint with `eslint.runtime-guard.config.mjs` — a curated set of +zero-false-positive RUNTIME-error rules (no style rules) — over `static/**/*.js`. + +Graceful skip: if node or a local/global eslint isn't available, the test SKIPS +(with a clear reason) rather than failing — so environments without the toolchain +aren't blocked. The release gate runs in an environment where eslint IS installed +(see TESTING.md), so the guard is enforced there. +""" +import json +import shutil +import subprocess +from pathlib import Path + +import pytest + +REPO = Path(__file__).resolve().parents[1] +CONFIG = REPO / "eslint.runtime-guard.config.mjs" + + +def _find_eslint(): + """Return a runnable eslint invocation (list of argv) or None.""" + # 1. project-local install + local = REPO / "node_modules" / ".bin" / "eslint" + if local.exists(): + return [str(local)] + # 2. on PATH + which = shutil.which("eslint") + if which: + return [which] + return None + + +@pytest.mark.skipif(not CONFIG.exists(), reason="eslint runtime-guard config missing") +def test_static_js_has_no_runtime_error_lint(): + eslint = _find_eslint() + if eslint is None: + pytest.skip( + "eslint not installed — install with " + "`npm install --no-save --before=<48h-ago> eslint` to enforce the " + "runtime-error guard locally (CI/release env has it). See TESTING.md." + ) + if shutil.which("node") is None: + pytest.skip("node not available") + + cmd = eslint + [ + "--no-config-lookup", + "-c", str(CONFIG), + "-f", "json", + str(REPO / "static"), + ] + proc = subprocess.run(cmd, capture_output=True, text=True, cwd=str(REPO), timeout=120) + + # ESLint exits non-zero on lint errors; parse the JSON either way. + try: + results = json.loads(proc.stdout or "[]") + except json.JSONDecodeError: + pytest.skip(f"eslint produced non-JSON output (env issue): {proc.stderr[:200]}") + + offenders = [] + for file_result in results: + for msg in file_result.get("messages", []): + if msg.get("severity") == 2: # error + offenders.append( + f"{Path(file_result['filePath']).name}:{msg.get('line')}:{msg.get('column')} " + f"{msg.get('message')} ({msg.get('ruleId')})" + ) + + assert not offenders, ( + "Static JS runtime-error lint failed — these throw at runtime in the browser " + "(brick-class, see #3162). Fix them (e.g. `const` -> `let` when reassigned):\n " + + "\n ".join(offenders) + ) From f50763b3d25847405290fcc7f701472c136d1813 Mon Sep 17 00:00:00 2001 From: AJV20 <24819659+AJV20@users.noreply.github.com> Date: Fri, 29 May 2026 22:27:36 -0400 Subject: [PATCH 273/349] docs: clarify docker host and home paths --- CHANGELOG.md | 4 +++ README.md | 4 +++ docs/docker.md | 26 +++++++++++++++- tests/test_issue3012_3006_docker_docs.py | 38 ++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 tests/test_issue3012_3006_docker_docs.py diff --git a/CHANGELOG.md b/CHANGELOG.md index db1a99b569..554c4ca502 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ ## [Unreleased] +### Fixed + +- Docker docs now explain host-localhost URLs (`host.docker.internal` / `host.containers.internal`) and the `sudo docker compose` `$HOME=/root` bind-mount pitfall for users whose WebUI cannot reach host APIs or see `~/.hermes` (#3012, #3006). + ## [v0.51.168] — 2026-05-30 — Release EN (stage-batch50 — hotfix: mobile "Failed to load conversation messages") ### Fixed diff --git a/README.md b/README.md index 9ce29386cd..567339cbe6 100644 --- a/README.md +++ b/README.md @@ -245,6 +245,8 @@ docker compose up -d # Open http://localhost:8787 ``` +Run Compose as the user who owns your Hermes home. `sudo docker compose up -d` can make `${HOME}` expand to the root user's home, so Docker mounts the wrong `.hermes` directory instead of your real `~/.hermes` and the WebUI starts with `config.yaml (not found, using defaults)`. Prefer adding your user to the Docker group and running `docker compose up -d`; if you must use sudo, set absolute paths first, for example `HERMES_HOME=/home/you/.hermes HERMES_WORKSPACE=/home/you/workspace sudo -E docker compose up -d`, then verify with `docker compose config`. + The container auto-detects your UID/GID from the mounted `~/.hermes` volume so files written by the agent stay readable by you on the host. To enable password protection (required if you expose the port outside `127.0.0.1`): @@ -308,6 +310,8 @@ Both compose files use **named Docker volumes** by default, which solves the UID | `git: command not found` in chat | Two-container architectural limit (#681) | Use single-container or extend Dockerfile | | WebUI can't find agent source | `hermes-agent-src` volume misconfigured | Use the named volumes from compose files as-is | | Podman shared `.hermes` fails | Podman 3.4 `keep-id` limitation | Use Podman 4+ or single-container | +| Host API at `localhost` fails from WebUI | Container `localhost` means the container, not your host (#3012) | Use `http://host.docker.internal:` on Docker Desktop, or `http://host.containers.internal:` on Podman | +| WebUI can't see `~/.hermes` after `sudo docker compose` | `${HOME}` expanded to the root user's home (#3006) | Run Compose as your user, or pass absolute `HERMES_HOME`/`HERMES_WORKSPACE` with `sudo -E` | For the deep dive on each of these, see [`docs/docker.md`](docs/docker.md). diff --git a/docs/docker.md b/docs/docker.md index d5a4186e6a..e0a2253938 100644 --- a/docs/docker.md +++ b/docs/docker.md @@ -188,6 +188,27 @@ If you must use a bind mount: pick a host path, then mount it to `/opt/hermes` i **Fix**: Either upgrade to Podman 4+ (which fixes this), or use the [single-container setup](#5-minute-quickstart-single-container), or use the [community all-in-one image](https://github.com/sunnysktsang/hermes-suite). +### 8. "API base URL set to localhost fails from Docker" (#3012) + +**Symptom**: A provider, local model server, webhook, or custom API works on the host at `http://localhost:`, but fails when the same URL is configured in Hermes WebUI running in Docker. + +**Cause**: Inside a container, `localhost` means *that container*, not your laptop/host. The WebUI process cannot reach host services through `127.0.0.1` unless the service is running inside the same container. + +**Fix**: Point Docker-hosted WebUI at the host gateway name instead: + +- Docker Desktop on macOS/Windows: `http://host.docker.internal:` +- Podman: `http://host.containers.internal:` +- Linux Docker Engine: either publish the host service on the Docker bridge address, or add a host-gateway alias to your compose service: + +```yaml +services: + hermes-webui: + extra_hosts: + - "host.docker.internal:host-gateway" +``` + +Then configure the URL as `http://host.docker.internal:`. Also ensure the host service binds to an address reachable from containers (not only a loopback interface the Docker bridge cannot reach) and that your host firewall allows the connection. + ## Multi-container architecture The two- and three-container setups use **named Docker volumes** (not bind mounts) by default for a reason: named volumes solve the UID/GID problem by construction. Docker creates the volume's root directory with the correct ownership, all containers reading/writing to it see the same files, no host-side permission setup required. @@ -284,7 +305,8 @@ volumes: 1. The host directory MUST be readable by your container UID. Run `id -u` on the host and ensure `~/.hermes` is owned by that UID (or readable via group bits). 2. ALL containers sharing the volume must run as the SAME UID/GID. Set `UID=$(id -u)` and `GID=$(id -g)` in `.env`. -3. If your host `.env` is mode 0640, set `HERMES_SKIP_CHMOD=1` or `HERMES_HOME_MODE=0640` so the startup hook doesn't try to enforce 0600. +3. If you run Compose with sudo, do not rely on `${HOME}` defaults: `sudo` often changes `$HOME` to `/root`, so `${HERMES_HOME:-${HOME}/.hermes}` becomes `/root/.hermes`. Prefer running Docker as your user; otherwise pass absolute paths with `sudo -E`, for example `HERMES_HOME=/home/youruser/.hermes HERMES_WORKSPACE=/home/youruser/workspace sudo -E docker compose up -d`, and confirm the rendered bind mount with `docker compose config`. +4. If your host `.env` is mode 0640, set `HERMES_SKIP_CHMOD=1` or `HERMES_HOME_MODE=0640` so the startup hook doesn't try to enforce 0600. ## Reference @@ -300,6 +322,8 @@ volumes: - #1416 — agent-image upgrade requires removing `hermes-agent-src` named volume (see [Upgrading the agent container](#upgrading-the-agent-container)) - #1389 — `HERMES_HOME_MODE` override (fixed in v0.50.254 — agent honors `HERMES_SKIP_CHMOD` and `HERMES_HOME_MODE`) - #1399 — UID alignment in compose files (fixed in v0.50.260 via PR #1428 + this guide) +- #3012 — host `localhost` API URLs fail from Docker containers (use `host.docker.internal` / `host.containers.internal`) +- #3006 — `sudo docker compose` can mount `/root/.hermes` instead of the user's Hermes home - #858 — two-container `/opt/hermes` path confusion - #681 — tools running in WebUI container, not agent container (architectural) - #668 — auto-detect UID/GID from mounted volume diff --git a/tests/test_issue3012_3006_docker_docs.py b/tests/test_issue3012_3006_docker_docs.py new file mode 100644 index 0000000000..b81a5b1bfc --- /dev/null +++ b/tests/test_issue3012_3006_docker_docs.py @@ -0,0 +1,38 @@ +from pathlib import Path + +REPO = Path(__file__).resolve().parents[1] +README = (REPO / "README.md").read_text(encoding="utf-8") +DOCKER_MD = (REPO / "docs" / "docker.md").read_text(encoding="utf-8") + + +def test_docker_docs_explain_host_localhost_for_api_urls(): + """#3012: container localhost is not the Docker host localhost.""" + assert "API base URL set to localhost fails from Docker" in DOCKER_MD + assert "Inside a container, `localhost` means *that container*" in DOCKER_MD + assert "host.docker.internal" in DOCKER_MD + assert "host.containers.internal" in DOCKER_MD + assert "host-gateway" in DOCKER_MD + + +def test_readme_common_failures_mentions_host_localhost(): + assert "Host API at `localhost` fails from WebUI" in README + assert "Container `localhost` means the container" in README + assert "host.docker.internal" in README + + +def test_docker_docs_warn_sudo_changes_home_bind_mount(): + """#3006: sudo can render ${HOME}/.hermes as /root/.hermes.""" + assert "`sudo docker compose up -d` can make `${HOME}` expand to the root user's home" in README + assert "Docker mounts the wrong `.hermes` directory instead of your real `~/.hermes`" in README + assert "HERMES_HOME=/home/you/.hermes" in README + + assert "sudo` often changes `$HOME` to `/root`" in DOCKER_MD + assert "`${HERMES_HOME:-${HOME}/.hermes}` becomes `/root/.hermes`" in DOCKER_MD + assert "HERMES_HOME=/home/youruser/.hermes" in DOCKER_MD + assert "docker compose config" in DOCKER_MD + + +def test_related_issues_index_references_3012_and_3006(): + related = DOCKER_MD[DOCKER_MD.index("## Related issues"):] + assert "#3012" in related + assert "#3006" in related From 7efb4c5acba41efab4c69e9cf6ed26f23721ac2c Mon Sep 17 00:00:00 2001 From: AJV20 <24819659+AJV20@users.noreply.github.com> Date: Fri, 29 May 2026 22:32:21 -0400 Subject: [PATCH 274/349] fix: scope skill toggles to active profile --- CHANGELOG.md | 1 + api/routes.py | 23 +++++- ..._issue3066_profile_skill_disabled_state.py | 72 +++++++++++++++++++ 3 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 tests/test_issue3066_profile_skill_disabled_state.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 554c4ca502..b7e3c7ec35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ ### Fixed - Docker docs now explain host-localhost URLs (`host.docker.internal` / `host.containers.internal`) and the `sudo docker compose` `$HOME=/root` bind-mount pitfall for users whose WebUI cannot reach host APIs or see `~/.hermes` (#3012, #3006). +- Skills panel disabled/enabled state and toggle writes now resolve `config.yaml` from the active WebUI profile instead of the process default Hermes home or startup config override (#3066). ## [v0.51.168] — 2026-05-30 — Release EN (stage-batch50 — hotfix: mobile "Failed to load conversation messages") diff --git a/api/routes.py b/api/routes.py index cc8bd761d1..0ce2c25db5 100644 --- a/api/routes.py +++ b/api/routes.py @@ -212,6 +212,25 @@ def _worktree_retained_payload_for_session_id(sid: str) -> dict: return {} +def _active_profile_config_path() -> Path: + """Return config.yaml for the request's active WebUI profile. + + Skills endpoints are profile-scoped UI actions: both the visible disabled + toggle state and toggle writes must follow the cookie/thread-local active + Hermes home, not process-global HERMES_HOME or HERMES_CONFIG_PATH values + captured at server startup. + """ + test_override_module = getattr(_get_config_path, "__module__", "") + if test_override_module != "api.config": + return _get_config_path() + try: + from api.profiles import get_active_hermes_home + + return Path(get_active_hermes_home()) / "config.yaml" + except Exception: + return _get_config_path() + + def _get_disabled_skill_names_for_profile() -> set: """Read disabled skill names from the active profile's config.yaml. @@ -221,7 +240,7 @@ def _get_disabled_skill_names_for_profile() -> set: ``skills.platform_disabled.webui`` first, falling back to ``skills.disabled``. """ - config_path = _get_config_path() + config_path = _active_profile_config_path() if not config_path.exists(): return set() try: @@ -12241,7 +12260,7 @@ def _handle_skill_toggle(handler, body): if not skill_md: return bad(handler, f"Skill '{name}' not found", 404) - config_path = _get_config_path() + config_path = _active_profile_config_path() with _cfg_lock: cfg = _load_yaml_config_file(config_path) diff --git a/tests/test_issue3066_profile_skill_disabled_state.py b/tests/test_issue3066_profile_skill_disabled_state.py new file mode 100644 index 0000000000..ec8b698656 --- /dev/null +++ b/tests/test_issue3066_profile_skill_disabled_state.py @@ -0,0 +1,72 @@ +from pathlib import Path + +import yaml + + +def _write_skill(root: Path, name: str): + skill_dir = root / "skills" / name + skill_dir.mkdir(parents=True, exist_ok=True) + (skill_dir / "SKILL.md").write_text( + f"---\nname: {name}\ndescription: {name} skill\n---\n\n# {name}\n", + encoding="utf-8", + ) + + +def _write_config(home: Path, disabled): + home.mkdir(parents=True, exist_ok=True) + (home / "config.yaml").write_text( + yaml.safe_dump({"skills": {"disabled": list(disabled)}}, sort_keys=False), + encoding="utf-8", + ) + + +def _load_config(home: Path): + return yaml.safe_load((home / "config.yaml").read_text(encoding="utf-8")) or {} + + +def test_skills_list_reads_disabled_state_from_active_profile(monkeypatch, tmp_path): + """#3066: the skill directory and disabled toggle state must use the same profile.""" + from api import profiles, routes + + default_home = tmp_path / "default" + active_home = tmp_path / "profiles" / "auditor" + for name in ("alpha", "beta"): + _write_skill(active_home, name) + _write_config(default_home, ["alpha"]) + _write_config(active_home, ["beta"]) + + monkeypatch.setenv("HERMES_HOME", str(default_home)) + monkeypatch.setattr(profiles, "get_active_hermes_home", lambda: active_home) + + listed = routes._skills_list_from_dir(active_home / "skills")["skills"] + by_name = {skill["name"]: skill for skill in listed} + + assert by_name["alpha"]["disabled"] is False + assert by_name["beta"]["disabled"] is True + + +def test_skill_toggle_writes_active_profile_config_not_default(monkeypatch, tmp_path): + """#3066: WebUI toggle writes the active profile config, not default HERMES_HOME.""" + from api import profiles, routes + + default_home = tmp_path / "default" + active_home = tmp_path / "profiles" / "trader" + _write_skill(active_home, "gamma") + _write_config(default_home, []) + _write_config(active_home, ["gamma"]) + + monkeypatch.setenv("HERMES_HOME", str(default_home)) + monkeypatch.setattr(profiles, "get_active_hermes_home", lambda: active_home) + monkeypatch.setattr(routes, "reload_config", lambda: None) + monkeypatch.setattr(routes, "j", lambda _handler, payload: payload) + monkeypatch.setattr(routes, "bad", lambda _handler, message, status=400: {"error": message, "status": status}) + + enabled_response = routes._handle_skill_toggle(None, {"name": "gamma", "enabled": True}) + assert enabled_response == {"ok": True, "name": "gamma", "enabled": True} + assert _load_config(active_home)["skills"]["disabled"] == [] + assert _load_config(default_home)["skills"]["disabled"] == [] + + disabled_response = routes._handle_skill_toggle(None, {"name": "gamma", "enabled": False}) + assert disabled_response == {"ok": True, "name": "gamma", "enabled": False} + assert _load_config(active_home)["skills"]["disabled"] == ["gamma"] + assert _load_config(default_home)["skills"]["disabled"] == [] From fbc0742621c0eec7b2689d2d2805cd32f6b6ae8c Mon Sep 17 00:00:00 2001 From: AJV20 <24819659+AJV20@users.noreply.github.com> Date: Fri, 29 May 2026 22:18:55 -0400 Subject: [PATCH 275/349] fix: ignore release tags already contained by head --- CHANGELOG.md | 1 + api/updates.py | 47 ++++++++++++++++++------ tests/test_update_banner_fixes.py | 4 +++ tests/test_updates.py | 59 ++++++++++++++++++++++++++++++- 4 files changed, 99 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7e3c7ec35..5c0d6b1198 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Docker docs now explain host-localhost URLs (`host.docker.internal` / `host.containers.internal`) and the `sudo docker compose` `$HOME=/root` bind-mount pitfall for users whose WebUI cannot reach host APIs or see `~/.hermes` (#3012, #3006). - Skills panel disabled/enabled state and toggle writes now resolve `config.yaml` from the active WebUI profile instead of the process default Hermes home or startup config override (#3066). +- Update checks no longer advertise a newer release tag when a main-tracking checkout already contains that tag; the banner now falls through to the branch comparison path instead of offering an update that cannot fast-forward (#3140). ## [v0.51.168] — 2026-05-30 — Release EN (stage-batch50 — hotfix: mobile "Failed to load conversation messages") diff --git a/api/updates.py b/api/updates.py index 2db8269fe7..86c1d73875 100644 --- a/api/updates.py +++ b/api/updates.py @@ -444,6 +444,20 @@ def _head_is_past_latest_tag(path, current_tag): return bool(ok and full_desc and full_desc != current_tag) +def _head_contains_ref(path, ref): + """Return True when ``ref`` is an ancestor of HEAD. + + Release-channel checks are tag-name based, but users tracking ``main`` can + be on a commit that already contains the newest published tag. In that case + a positive tag gap is not an available update; applying the tag would move + backwards or fail fast-forward. Use the commit graph to detect that state. + """ + if not ref: + return False + _, ok = _run_git(['merge-base', '--is-ancestor', ref, 'HEAD'], path) + return bool(ok) + + def _select_apply_compare_ref(path): """Return the same remote ref family that the update check reports. @@ -464,17 +478,20 @@ def _select_apply_compare_ref(path): latest_tag = tags[0] current_tag = _current_release_tag(path) behind = _release_gap(tags, current_tag, latest_tag) - # Mirror the check side exactly: only fall through when behind == 0 - # AND HEAD has moved past its nearest tag (case A: bench between - # tagged releases). Otherwise the tag is correct — including the - # case where HEAD is on an older release tag with commits on top - # AND a newer tag exists (case D), where `behind > 0` means the - # user is genuinely behind the latest release and should advance - # to it. Pre-#2855 the apply path only consulted `latest_tag` - # without the `behind`/`current_tag` predicate, so case D fell - # through to `origin/` and the pull landed past the - # advertised tag. See #2846 + Opus pre-release review for #2855. - if not (behind == 0 and _head_is_past_latest_tag(path, current_tag)): + # Mirror the check side exactly: fall through to the branch comparison + # whenever the checkout has already moved past the release tag that the + # banner would otherwise advertise. The common case is behind == 0 and + # HEAD is past its nearest tag, but main-tracking checkouts can also + # have behind > 0 after fetching a newer tag that HEAD already contains + # (#3140). In both cases applying the tag would no-op, move backwards, + # or fail fast-forward; branch comparison is the truthful update path. + if ( + behind == 0 and _head_is_past_latest_tag(path, current_tag) + ) or ( + behind > 0 and _head_contains_ref(path, latest_tag) + ): + pass + else: return latest_tag upstream, ok = _run_git(['rev-parse', '--abbrev-ref', '@{upstream}'], path) @@ -504,6 +521,14 @@ def _check_repo_release(path, name): if behind == 0 and _head_is_past_latest_tag(path, current_tag): return None + # Users tracking main can already contain the newest fetched release tag + # while their nearest reachable tag is older. A positive tag gap then means + # only "there is a newer tag name", not "HEAD is behind that tag" (#3140). + # Fall through to the branch check so the banner compares against the + # configured upstream instead of advertising a tag that cannot fast-forward. + if behind > 0 and _head_contains_ref(path, latest_tag): + return None + remote_url, _ = _run_git(['remote', 'get-url', 'origin'], path) remote_url = _normalize_remote_url(remote_url) diff --git a/tests/test_update_banner_fixes.py b/tests/test_update_banner_fixes.py index 6855ad6557..957a9904f7 100644 --- a/tests/test_update_banner_fixes.py +++ b/tests/test_update_banner_fixes.py @@ -558,6 +558,10 @@ def fake_run(args, cwd, timeout=10): return '', True if args[0] == 'tag': return 'v0.51.106\nv0.51.105\nv0.51.104', True + if args == ['describe', '--tags', '--abbrev=0']: + return 'v0.51.105', True + if args == ['merge-base', '--is-ancestor', 'v0.51.106', 'HEAD']: + return '', False if args[:2] == ['status', '--porcelain']: return '', True if args[0] == 'pull': diff --git a/tests/test_updates.py b/tests/test_updates.py index 793fd61ca6..296f59cc3d 100644 --- a/tests/test_updates.py +++ b/tests/test_updates.py @@ -11,6 +11,8 @@ def _fake_git_for_release_fetch_failure(args, cwd, timeout=10): return 'v0.51.106\nv0.51.103', True if args == ['describe', '--tags', '--abbrev=0']: return 'v0.51.103', True + if args == ['merge-base', '--is-ancestor', 'v0.51.106', 'HEAD']: + return '', False if args == ['remote', 'get-url', 'origin']: return 'https://github.com/nesquena/hermes-webui.git', True raise AssertionError(f'unexpected git args: {args!r}') @@ -553,6 +555,58 @@ def fake_git(args, cwd, timeout=10): ) +def test_check_repo_release_falls_through_when_head_contains_newer_tag(tmp_path): + """#3140: main-tracking HEAD can already contain the newest release tag. + + The nearest reachable tag is older, so the tag-name gap is positive, but + applying the latest tag would not fast-forward because HEAD already contains + it. The release check should fall through to the branch comparison instead + of advertising a release update. + """ + (tmp_path / '.git').mkdir() + + def fake_git(args, cwd, timeout=10): + if args == ['tag', '--list', 'v*', '--sort=-v:refname']: + return 'v2026.5.29.2\nv2026.5.29', True + if args == ['describe', '--tags', '--abbrev=0']: + return 'v2026.5.29', True + if args == ['merge-base', '--is-ancestor', 'v2026.5.29.2', 'HEAD']: + return '', True + raise AssertionError(f'unexpected git args: {args!r}') + + with patch.object(updates, '_run_git', side_effect=fake_git): + result = updates._check_repo_release(tmp_path, 'agent') + + assert result is None, ( + 'when HEAD already contains the latest release tag, the release check ' + 'must fall through to the branch check instead of reporting a tag gap (#3140)' + ) + + +def test_select_apply_compare_ref_falls_through_when_head_contains_newer_tag(tmp_path): + """#3140: apply path mirrors the check-side fall-through for ahead-of-tag HEAD.""" + (tmp_path / '.git').mkdir() + + def fake_git(args, cwd, timeout=10): + if args == ['tag', '--list', 'v*', '--sort=-v:refname']: + return 'v2026.5.29.2\nv2026.5.29', True + if args == ['describe', '--tags', '--abbrev=0']: + return 'v2026.5.29', True + if args == ['merge-base', '--is-ancestor', 'v2026.5.29.2', 'HEAD']: + return '', True + if args == ['rev-parse', '--abbrev-ref', '@{upstream}']: + return 'origin/main', True + raise AssertionError(f'unexpected git args: {args!r}') + + with patch.object(updates, '_run_git', side_effect=fake_git): + ref = updates._select_apply_compare_ref(tmp_path) + + assert ref == 'origin/main', ( + 'Update Now must not target a release tag that HEAD already contains; ' + 'it should use the branch comparison path instead (#3140)' + ) + + def test_select_apply_compare_ref_case_d_older_tag_with_commits_and_newer_tag_exists(tmp_path): """Case D — HEAD on older tag + commits + newer tag exists → advance to newer tag. @@ -576,8 +630,11 @@ def fake_git(args, cwd, timeout=10): # HEAD's nearest reachable tag (older one) return 'v2026.5.10', True if args == ['describe', '--tags', '--always']: - # HEAD has 3 commits past v2026.5.10 + # HEAD has 3 commits past v2026.5.10, but it does not contain + # the newer v2026.5.16 release tag. return 'v2026.5.10-3-gabcdef12', True + if args == ['merge-base', '--is-ancestor', 'v2026.5.16', 'HEAD']: + return '', False if args == ['rev-parse', '--abbrev-ref', '@{upstream}']: return 'origin/main', True return '', True From d032653a97044bd9eb0fab85271039158302961b Mon Sep 17 00:00:00 2001 From: nesquena-hermes <[email protected]> Date: Sat, 30 May 2026 03:51:13 +0000 Subject: [PATCH 276/349] test(#3066): mark profile-skill tests requires_agent_modules (skill_utils import unavailable in CI) --- tests/test_issue3066_profile_skill_disabled_state.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/test_issue3066_profile_skill_disabled_state.py b/tests/test_issue3066_profile_skill_disabled_state.py index ec8b698656..f7832decff 100644 --- a/tests/test_issue3066_profile_skill_disabled_state.py +++ b/tests/test_issue3066_profile_skill_disabled_state.py @@ -2,6 +2,8 @@ import yaml +from tests.conftest import requires_agent_modules + def _write_skill(root: Path, name: str): skill_dir = root / "skills" / name @@ -24,6 +26,7 @@ def _load_config(home: Path): return yaml.safe_load((home / "config.yaml").read_text(encoding="utf-8")) or {} +@requires_agent_modules def test_skills_list_reads_disabled_state_from_active_profile(monkeypatch, tmp_path): """#3066: the skill directory and disabled toggle state must use the same profile.""" from api import profiles, routes @@ -45,6 +48,7 @@ def test_skills_list_reads_disabled_state_from_active_profile(monkeypatch, tmp_p assert by_name["beta"]["disabled"] is True +@requires_agent_modules def test_skill_toggle_writes_active_profile_config_not_default(monkeypatch, tmp_path): """#3066: WebUI toggle writes the active profile config, not default HERMES_HOME.""" from api import profiles, routes From 5cb82f9da449fc69a4cede8de96f13e97d7b6ec1 Mon Sep 17 00:00:00 2001 From: AJV20 <24819659+AJV20@users.noreply.github.com> Date: Fri, 29 May 2026 22:37:04 -0400 Subject: [PATCH 277/349] fix: make SSE replay cursors run-aware --- CHANGELOG.md | 8 ++++++++ api/routes.py | 24 ++++++++++++++++++++++-- static/messages.js | 13 ++++++++++--- tests/test_run_journal_routes.py | 23 ++++++++++++++++++++++- 4 files changed, 62 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c0d6b1198..ea29cc2461 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ ## [Unreleased] +## [v0.51.170] — 2026-05-30 — Release EP (stage-batch52 — run-aware SSE replay cursors) + +### Fixed + +- SSE run-journal replay cursors are now run-aware: a stale `after_seq` from an interrupted prior stream can no longer suppress replay events in a newer stream whose sequence numbers reset from 1. The reconnect cursor now carries a run-scoped `after_event_id` (`run_id:seq`) and the server ignores it when the run id differs, falling back to same-run `after_seq` dedupe (#3124). + +## [v0.51.169] — 2026-05-30 — Release EO (stage-batch51 — skill-toggle profile scoping + update-tag filter + Docker docs) + ### Fixed - Docker docs now explain host-localhost URLs (`host.docker.internal` / `host.containers.internal`) and the `sudo docker compose` `$HOME=/root` bind-mount pitfall for users whose WebUI cannot reach host APIs or see `~/.hermes` (#3012, #3006). diff --git a/api/routes.py b/api/routes.py index 0ce2c25db5..d448a382d0 100644 --- a/api/routes.py +++ b/api/routes.py @@ -7321,7 +7321,27 @@ def _sse_with_id(handler, event, data, event_id=None): _sse(handler, event, data) -def _parse_run_journal_after_seq(qs: dict) -> int | None: +def _parse_run_journal_event_id(raw: str | None) -> tuple[str | None, int | None]: + raw = str(raw or "").strip() + if not raw: + return None, None + if ":" in raw: + run_id, tail = raw.rsplit(":", 1) + else: + run_id, tail = None, raw + try: + seq = max(0, int(tail)) + except (TypeError, ValueError): + return run_id or None, None + return run_id or None, seq + + +def _parse_run_journal_after_seq(qs: dict, stream_id: str | None = None) -> int | None: + event_run_id, event_seq = _parse_run_journal_event_id(qs.get("after_event_id", [None])[0]) + if event_run_id: + if stream_id and event_run_id != stream_id: + return None + return event_seq raw = qs.get("after_seq", [None])[0] if raw in (None, ""): return None @@ -7376,7 +7396,7 @@ def _handle_sse_stream(handler, parsed): handler.send_header("Connection", "close") handler.end_headers() try: - _replay_run_journal(handler, stream_id, _parse_run_journal_after_seq(qs)) + _replay_run_journal(handler, stream_id, _parse_run_journal_after_seq(qs, stream_id)) except _CLIENT_DISCONNECT_ERRORS: pass return True diff --git a/static/messages.js b/static/messages.js index 5af08e2fce..d9209cceae 100644 --- a/static/messages.js +++ b/static/messages.js @@ -946,6 +946,7 @@ function attachLiveStream(activeSid, streamId, uploaded=[], options={}){ let _streamFadeReduceMotion=false; let _streamFadeReduceMotionOnChange=null; let _lastRunJournalSeq=0; + let _lastRunJournalEventId=''; const _STREAM_FADE_MS=200; const _STREAM_FADE_MAX_MS=350; const _STREAM_FADE_STAGGER_MS=16; @@ -1462,7 +1463,10 @@ function attachLiveStream(activeSid, streamId, uploaded=[], options={}){ if(!raw) return; const tail=raw.includes(':')?raw.slice(raw.lastIndexOf(':')+1):raw; const seq=Number.parseInt(tail,10); - if(Number.isFinite(seq)&&seq>_lastRunJournalSeq) _lastRunJournalSeq=seq; + if(Number.isFinite(seq)&&seq>_lastRunJournalSeq){ + _lastRunJournalSeq=seq; + _lastRunJournalEventId=raw; + } } function _runJournalReplayAfterSeq(){ return Math.max(0,_lastRunJournalSeq||0); @@ -1470,8 +1474,11 @@ function attachLiveStream(activeSid, streamId, uploaded=[], options={}){ function _runJournalReplayParams(){ // `replay=1` documents frontend intent. The server selects replay when the // stream id no longer has a live worker; `after_seq` prevents duplicated - // journal events after this EventSource has already rendered part of a run. - return `&replay=1&after_seq=${encodeURIComponent(String(_runJournalReplayAfterSeq()))}`; + // journal events after this EventSource has already rendered part of the + // same run. `after_event_id` keeps that cursor run-aware so a stale cursor + // from an earlier interrupted stream cannot suppress a newer stream whose + // sequence numbers started over from 1. + return `&replay=1&after_seq=${encodeURIComponent(String(_runJournalReplayAfterSeq()))}&after_event_id=${encodeURIComponent(_lastRunJournalEventId||'')}`; } let _lastRenderMs=0; diff --git a/tests/test_run_journal_routes.py b/tests/test_run_journal_routes.py index 187541cf03..860a48a93c 100644 --- a/tests/test_run_journal_routes.py +++ b/tests/test_run_journal_routes.py @@ -24,7 +24,7 @@ def test_dead_stream_sse_replays_journal_before_404_fallback(): assert "find_run_summary(stream_id)" in block assert "stream not found" in block assert "_replay_run_journal" in block - assert "_parse_run_journal_after_seq" in block + assert "_parse_run_journal_after_seq(qs, stream_id)" in block assert 'Content-Type", "text/event-stream; charset=utf-8"' in block @@ -160,3 +160,24 @@ def fake_read_run_events(session_id, run_id, after_seq=None): body = handler.wfile.getvalue().decode("utf-8") assert "id: run_1:4\n" in body assert "event: done\n" in body + + +def test_parse_run_journal_after_seq_is_run_aware(): + import api.routes as routes + + assert routes._parse_run_journal_after_seq( + {"after_event_id": ["new-run:7"], "after_seq": ["7"]}, + "new-run", + ) == 7 + assert routes._parse_run_journal_after_seq( + {"after_event_id": ["old-run:7"], "after_seq": ["7"]}, + "new-run", + ) is None + assert routes._parse_run_journal_after_seq({"after_seq": ["3"]}, "new-run") == 3 + + +def test_frontend_sends_run_aware_replay_cursor(): + messages_src = (ROOT / "static" / "messages.js").read_text(encoding="utf-8") + assert "let _lastRunJournalEventId=''" in messages_src + assert "_lastRunJournalEventId=raw" in messages_src + assert "after_event_id=${encodeURIComponent(_lastRunJournalEventId||'')}" in messages_src From d34d11821b89da66da22013b4a5ef44a8f4f6eba Mon Sep 17 00:00:00 2001 From: AJV20 <24819659+AJV20@users.noreply.github.com> Date: Fri, 29 May 2026 22:22:15 -0400 Subject: [PATCH 278/349] fix: label tool output cards persistently --- CHANGELOG.md | 7 ++++ static/style.css | 3 +- static/ui.js | 1 + ...ssue2867_tool_output_visual_distinction.py | 33 +++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 tests/test_issue2867_tool_output_visual_distinction.py diff --git a/CHANGELOG.md b/CHANGELOG.md index ea29cc2461..c8ec946546 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ ## [Unreleased] +## [v0.51.171] — 2026-05-30 — Release EQ (stage-batch53 — tool-output card badge + Neon opt-in skin) + +### Added + +- Tool-call output cards now carry a persistent "Tool output" badge and accent rail so tool output stays visually distinct from final assistant responses without requiring hover (#2867). +- New opt-in "Neon" cyberpunk skin (dark-first, purple/cyan accents). Default-off; select it from the skin list like Catppuccin or Nous. + ## [v0.51.170] — 2026-05-30 — Release EP (stage-batch52 — run-aware SSE replay cursors) ### Fixed diff --git a/static/style.css b/static/style.css index 90b36834e5..0b9097e53f 100644 --- a/static/style.css +++ b/static/style.css @@ -2544,11 +2544,12 @@ body.resizing .sidebar{transition:none!important;} display:none; } } -.tool-card{background:var(--surface-subtle);border:1px solid var(--border-muted);border-left:2px solid var(--border-muted);border-radius:var(--radius-card);margin:2px 0;overflow:hidden;transition:border-color .15s,background-color .15s;} +.tool-card{background:var(--surface-subtle);border:1px solid var(--border-muted);border-left:3px solid var(--accent-bg-strong);border-radius:var(--radius-card);margin:2px 0;overflow:hidden;transition:border-color .15s,background-color .15s;} .tool-card:hover{border-color:var(--border2);background:var(--surface-subtle-hover);} .tool-card-running{border-color:var(--accent-bg-strong);background:var(--accent-bg);} .tool-card-header{display:flex;align-items:center;gap:var(--space-2);padding:var(--space-1) var(--space-3);cursor:pointer;user-select:none;} .tool-card-icon{font-size:13px;flex-shrink:0;opacity:.65;} +.tool-card-badge{flex-shrink:0;font-size:10px;line-height:1.2;text-transform:uppercase;letter-spacing:.045em;font-weight:700;color:var(--accent-text);background:var(--accent-bg);border:1px solid var(--accent-bg-strong);border-radius:999px;padding:1px 6px;} .tool-card-name{font-size:var(--font-size-xs);font-weight:600;color:var(--muted);font-family:'SF Mono',ui-monospace,monospace;flex-shrink:0;} .tool-card-preview{font-size:var(--font-size-xs);color:var(--muted);opacity:.62;flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} .tool-card-toggle{font-size:10px;color:var(--muted);opacity:.45;flex-shrink:0;display:inline-flex;align-items:center;justify-content:center;transform-origin:center;transition:transform .18s ease;will-change:transform;} diff --git a/static/ui.js b/static/ui.js index 50ffce7863..5f2a9360d8 100644 --- a/static/ui.js +++ b/static/ui.js @@ -6987,6 +6987,7 @@ function buildToolCard(tc){
${runIndicator} ${icon} + Tool output ${esc(displayName)} ${esc(previewText)} ${hasDetail?`${li('chevron-right',12)}`:''} diff --git a/tests/test_issue2867_tool_output_visual_distinction.py b/tests/test_issue2867_tool_output_visual_distinction.py new file mode 100644 index 0000000000..f8daca2987 --- /dev/null +++ b/tests/test_issue2867_tool_output_visual_distinction.py @@ -0,0 +1,33 @@ +from pathlib import Path + +ROOT = Path(__file__).resolve().parent.parent +UI_JS = (ROOT / "static" / "ui.js").read_text(encoding="utf-8") +STYLE_CSS = (ROOT / "static" / "style.css").read_text(encoding="utf-8") + + +def test_tool_cards_render_persistent_tool_output_badge(): + """Tool output must remain distinguishable without relying on hover state.""" + build_start = UI_JS.index('function buildToolCard(tc){') + build_end = UI_JS.index('function _syncToolCallGroupSummary', build_start) + build_tool_card = UI_JS[build_start:build_end] + + assert 'Tool output' in build_tool_card + assert '${esc(displayName)}' in build_tool_card + assert build_tool_card.index('class="tool-card-badge"') < build_tool_card.index('class="tool-card-name"') + + +def test_tool_card_badge_style_is_not_hover_only(): + badge_rule_start = STYLE_CSS.index('.tool-card-badge{') + badge_rule_end = STYLE_CSS.index('}', badge_rule_start) + badge_rule = STYLE_CSS[badge_rule_start:badge_rule_end] + + assert '.tool-card:hover .tool-card-badge' not in STYLE_CSS + assert 'text-transform:uppercase' in badge_rule + assert 'background:var(--accent-bg)' in badge_rule + assert 'border:1px solid var(--accent-bg-strong)' in badge_rule + assert 'color:var(--accent-text)' in badge_rule + + +def test_tool_cards_have_persistent_accent_rail(): + assert '.tool-card{background:var(--surface-subtle);' in STYLE_CSS + assert 'border-left:3px solid var(--accent-bg-strong)' in STYLE_CSS From a7c871d45e9862b13bd03486c24c02c48307c473 Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Sat, 30 May 2026 03:31:25 +0000 Subject: [PATCH 279/349] feat: add Neon cyberpunk skin Cyberpunk-inspired dark-first skin with neon purple (#B347FF) accent and cyan (#00DDFF) highlights. Full palette for both light and dark modes with component-level overrides (glow effects, purple scrollbars, tool cards, tree viewer, session badges, MCP status indicators). - static/style.css: 37 CSS rules (light + dark palette + components) - static/boot.js: Neon entry in _SKINS array - static/index.html: neon:1 in skin allowlist Follows the existing skin pattern (modeled after Nous). --- static/boot.js | 1 + static/index.html | 2 +- static/style.css | 80 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/static/boot.js b/static/boot.js index 3835e261e1..9136a02856 100644 --- a/static/boot.js +++ b/static/boot.js @@ -1343,6 +1343,7 @@ const _SKINS=[ {name:'Catppuccin',colors:['#CBA6F7','#B4BEFE','#8839EF']}, {name:'Hepburn', colors:['#c6246a','#ec5597','#f2abca']}, {name:'Nous', colors:['#4682B4','#3A6E9A','#2C5F88']}, + {name:'Neon', colors:['#B347FF','#C76BFF','#00DDFF']}, {name:'Geist Contrast', value:'geist-contrast', colors:['#000000','#ffffff','#FFF175']}, ]; const _VALID_THEMES=new Set((_THEMES||[]).map(t=>t.value)); diff --git a/static/index.html b/static/index.html index ccd2a34447..5969bde249 100644 --- a/static/index.html +++ b/static/index.html @@ -17,7 +17,7 @@ - + diff --git a/static/style.css b/static/style.css index 0b9097e53f..f1a97f7932 100644 --- a/static/style.css +++ b/static/style.css @@ -345,6 +345,86 @@ :root.dark[data-skin="nous"] .mcp-http{color:#7EB6E0;} :root.dark[data-skin="nous"] .mcp-status-active{color:#7EB6E0;} + /* ═══ NEON — cyberpunk theme (dark-first) ═══ */ + :root[data-skin="neon"]{ + --bg:#F8F7FC;--sidebar:#F0EEF8;--border:#D8D4EC;--border2:rgba(0,0,0,0.12); + --text:#1E1B2E;--muted:#6E6888;--accent:#9333EA;--blue:#7C3AED;--gold:#A855F7;--code-bg:#F0EDF8; + --surface:#FFFFFF;--topbar-bg:rgba(248,247,252,.98);--main-bg:rgba(248,247,252,0.5); + --focus-ring:rgba(147,51,234,.3);--focus-glow:rgba(147,51,234,.08); + --input-bg:rgba(147,51,234,.03);--hover-bg:rgba(147,51,234,.05); + --strong:#0D0B14;--em:#7C3AED;--code-text:#6D28D9;--code-inline-bg:rgba(147,51,234,.08);--pre-text:#1E1B2E; + --accent-hover:#7E22CE;--accent-bg:rgba(147,51,234,0.06);--accent-bg-strong:rgba(147,51,234,0.12);--accent-text:#6D28D9; + --error:#DC2626;--success:#059669;--warning:#D97706;--info:#7C3AED; + --radius-sm:2px;--radius-md:4px;--radius-card:4px;--radius-lg:6px; + --font-ui:system-ui,-apple-system,sans-serif; + --surface-subtle:rgba(147,51,234,.025);--surface-subtle-hover:rgba(147,51,234,.05); + --border-subtle:rgba(147,51,234,.08);--border-muted:rgba(147,51,234,.12); + --purple:#9333EA; + } + :root.dark[data-skin="neon"]{ + --bg:#08060d;--sidebar:#06040a;--border:#1c1633;--border2:rgba(179,71,255,0.15); + --text:#d8d6f0;--muted:#6a6588;--accent:#b347ff;--blue:#a78bfa;--gold:#c084fc;--code-bg:#050308; + --surface:#0f0d1a;--topbar-bg:rgba(8,6,13,.98);--main-bg:rgba(8,6,13,0.5); + --focus-ring:rgba(179,71,255,.35);--focus-glow:rgba(179,71,255,.10); + --input-bg:rgba(179,71,255,.04);--hover-bg:rgba(179,71,255,.06); + --strong:#f0edff;--em:#00ddff;--code-text:#c8c0f0;--code-inline-bg:rgba(179,71,255,.10);--pre-text:#d8d6f0; + --accent-hover:#c76bff;--accent-bg:rgba(179,71,255,0.10);--accent-bg-strong:rgba(179,71,255,0.20);--accent-text:#c8a0ff; + --error:#ff4466;--success:#00dd88;--warning:#ffaa33;--info:#00ddff; + --surface-subtle:rgba(179,71,255,.03);--surface-subtle-hover:rgba(179,71,255,.06); + --border-subtle:rgba(179,71,255,.08);--border-muted:rgba(179,71,255,.12); + --purple:#b347ff; + } + /* ── Neon skin: component-level overrides ── */ + /* Selection glow */ + :root.dark[data-skin="neon"] ::selection{background:rgba(179,71,255,0.35);color:#fff;} + /* Topbar: purple bottom border with glow */ + :root.dark[data-skin="neon"] .app-titlebar{border-bottom-color:rgba(179,71,255,0.2);} + /* Sidebar: subtle purple inset shadow */ + :root.dark[data-skin="neon"] .sidebar{box-shadow:inset -1px 0 30px rgba(179,71,255,0.03);} + /* Inputs: purple glow on focus */ + :root.dark[data-skin="neon"] textarea:focus, + :root.dark[data-skin="neon"] input[type="text"]:focus, + :root.dark[data-skin="neon"] input[type="password"]:focus, + :root.dark[data-skin="neon"] select:focus{box-shadow:0 0 16px rgba(179,71,255,0.2);} + /* Send button: neon glow */ + :root.dark[data-skin="neon"] button.send-btn{box-shadow:0 0 14px rgba(179,71,255,0.25);} + :root.dark[data-skin="neon"] button.send-btn:hover{box-shadow:0 0 24px rgba(179,71,255,0.45);} + /* New chat button: purple gradient */ + :root.dark[data-skin="neon"] .new-chat-btn{background:var(--accent);border-color:var(--accent);color:#fff;font-weight:600;box-shadow:0 0 12px rgba(179,71,255,0.2);} + :root.dark[data-skin="neon"] .new-chat-btn:hover{background:var(--accent-hover);border-color:var(--accent-hover);color:#fff;box-shadow:0 0 20px rgba(179,71,255,0.35);} + /* Scrollbar: purple */ + :root.dark[data-skin="neon"]::-webkit-scrollbar-thumb{background:rgba(179,71,255,.18);border-radius:3px;} + :root.dark[data-skin="neon"]::-webkit-scrollbar-thumb:hover{background:rgba(179,71,255,.30);} + :root.dark[data-skin="neon"]{scrollbar-width:thin;scrollbar-color:rgba(179,71,255,.18) transparent;} + /* Tool cards */ + :root.dark[data-skin="neon"] .tool-card{background:rgba(179,71,255,0.03);border-color:rgba(179,71,255,0.08);} + :root.dark[data-skin="neon"] .tool-card:hover{border-color:rgba(179,71,255,0.2);} + :root.dark[data-skin="neon"] .tool-card-running{background:var(--accent-bg);border-color:var(--accent-bg-strong);} + :root.dark[data-skin="neon"] .tool-card-name{color:var(--muted);font-weight:500;} + :root.dark[data-skin="neon"] .tool-arg-key, + :root.dark[data-skin="neon"] .tool-card-more{color:var(--accent-text);} + :root.dark[data-skin="neon"] .tool-card-running-dot{background:var(--accent);} + /* Tree viewer: purple family */ + :root.dark[data-skin="neon"] .tree-key{color:#b347ff;} + :root.dark[data-skin="neon"] .tree-str{color:#c8a0ff;} + :root.dark[data-skin="neon"] .tree-num{color:#00ddff;} + :root.dark[data-skin="neon"] .tree-bool{color:#b347ff;} + /* Session badges/tags */ + :root.dark[data-skin="neon"] .session-child-count{background:rgba(179,71,255,.16);color:#c8a0ff;} + :root.dark[data-skin="neon"] .session-child-count:hover{background:rgba(179,71,255,.26);color:#d8c0ff;} + :root.dark[data-skin="neon"] .session-tree-badge{background:rgba(179,71,255,.2);color:#c8a0ff;} + :root.dark[data-skin="neon"] .session-tag{background:rgba(179,71,255,.2);color:#c8a0ff;} + /* Diff blocks */ + :root.dark[data-skin="neon"] .diff-block .diff-plus{color:#b347ff;} + /* MCP status */ + :root.dark[data-skin="neon"] .mcp-http{color:#c8a0ff;} + :root.dark[data-skin="neon"] .mcp-status-active{color:#00dd88;} + /* Image lightbox */ + :root.dark[data-skin="neon"] .img-lightbox-close:hover{background:rgba(179,71,255,.35);} + /* Links: cyan with hover glow */ + :root.dark[data-skin="neon"] a{color:var(--info);transition:text-shadow 0.2s;} + :root.dark[data-skin="neon"] a:hover{text-shadow:0 0 8px rgba(0,221,255,0.4);} + /* ── Skin: Geist Contrast (Geist-inspired neutral precision) ── Dark mode uses a #FFF175 accent; solid accent controls use black foreground, while selected/navigation states stay neutral and restrained. */ From 5d73101c8eed00c46990e8b05f6353e13bd5c379 Mon Sep 17 00:00:00 2001 From: nesquena-hermes <[email protected]> Date: Sat, 30 May 2026 04:32:18 +0000 Subject: [PATCH 280/349] test: make .send-btn / .app-titlebar global-selector finders skin-variant-aware (#3164 Neon uses :root.dark[data-skin=]) --- tests/test_mobile_layout.py | 6 +++++- tests/test_sprint20b.py | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/test_mobile_layout.py b/tests/test_mobile_layout.py index 21a0656eef..49d6863042 100644 --- a/tests/test_mobile_layout.py +++ b/tests/test_mobile_layout.py @@ -681,7 +681,11 @@ def test_pwa_safe_area_top_stays_scoped_to_installed_modes(): def test_titlebar_safe_area_top_uses_scoped_variable(): """The titlebar must use the safe-area variable instead of direct env().""" - m = re.search(r'\.app-titlebar\{(?P[^}]*)\}', CSS) + # Match the GLOBAL `.app-titlebar{...}` rule, not skin-scoped variants like + # `:root.dark[data-skin="neon"] .app-titlebar{...}` (#3164) which can appear + # earlier in the file. Require the selector to start the line (optionally + # indented) with no `[data-skin=` scope prefix. + m = re.search(r'(?m)^\s*\.app-titlebar\{(?P[^}]*)\}', CSS) assert m, ".app-titlebar rule missing from style.css" rule = m.group("body") assert "padding-top:var(--app-titlebar-safe-top)" in rule, ( diff --git a/tests/test_sprint20b.py b/tests/test_sprint20b.py index 13aad7b718..ee41488aac 100644 --- a/tests/test_sprint20b.py +++ b/tests/test_sprint20b.py @@ -31,7 +31,10 @@ def _find_global_selector(css, selector): return -1 line_start = css.rfind('\n', 0, idx) + 1 line_prefix = css[line_start:idx] - if ':root[data-skin=' not in line_prefix: + # Skip skin-scoped rules. Skins use both `:root[data-skin="x"]` and the + # dark-variant `:root.dark[data-skin="x"]` (#3164 Neon), so match the + # `[data-skin=` marker generically rather than the bare `:root[` form. + if '[data-skin=' not in line_prefix: return idx pos = idx + 1 From 1a991041f1e2d21611dffd467d1cd0d225148ee6 Mon Sep 17 00:00:00 2001 From: mysoul12138 <839465496@qq.com> Date: Sat, 30 May 2026 15:13:03 +0800 Subject: [PATCH 281/349] fix: use getModelLabel() in _formatSessionModelWithGateway fallback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When gateway_routing is absent, _formatGatewayModelLabel returns '' and the fallback path returns raw s.model — which may contain an @provider: prefix (e.g. @token-plan-cn.xiaomimimo.com:mimo-v2.5-pro). getModelLabel() already handles stripping @provider: prefixes (ui.js:2855) but was never called in this fallback path. Route through it so the session list always displays a clean model name. Closes #3172 --- static/sessions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/sessions.js b/static/sessions.js index 0c89c1dabe..76b9c7dc2f 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -120,7 +120,7 @@ function _formatSessionModelWithGateway(s){ if(!s||!s.model)return''; const routing=(typeof _latestGatewayRoutingForSession==='function')?_latestGatewayRoutingForSession(s):(s.gateway_routing||null); if(typeof _formatGatewayModelLabel==='function'){ - return _formatGatewayModelLabel(s.model,s.model,routing)||s.model; + return _formatGatewayModelLabel(s.model,s.model,routing)||getModelLabel(s.model); } return s.model; } From 97dde9a48e545a7dddb7b0ff66162c338af21d15 Mon Sep 17 00:00:00 2001 From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com> Date: Sat, 30 May 2026 10:26:03 +0200 Subject: [PATCH 282/349] fix: restore legacy tool card visuals --- CHANGELOG.md | 4 ++++ static/style.css | 4 ++-- static/ui.js | 1 - ...ssue2867_tool_output_visual_distinction.py | 24 +++++++------------ 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8ec946546..8bb98eb411 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ ## [Unreleased] +### Changed + +- Restored the legacy compact tool-call card chrome by removing the persistent "Tool output" badge and returning the left rail to the muted border treatment. This keeps tool activity visually quieter while preserving the existing collapsible tool details. + ## [v0.51.171] — 2026-05-30 — Release EQ (stage-batch53 — tool-output card badge + Neon opt-in skin) ### Added diff --git a/static/style.css b/static/style.css index f1a97f7932..acefebf549 100644 --- a/static/style.css +++ b/static/style.css @@ -2624,12 +2624,12 @@ body.resizing .sidebar{transition:none!important;} display:none; } } -.tool-card{background:var(--surface-subtle);border:1px solid var(--border-muted);border-left:3px solid var(--accent-bg-strong);border-radius:var(--radius-card);margin:2px 0;overflow:hidden;transition:border-color .15s,background-color .15s;} +.tool-card{background:var(--surface-subtle);border:1px solid var(--border-muted);border-left:2px solid var(--border-muted);border-radius:var(--radius-card);margin:2px 0;overflow:hidden;transition:border-color .15s,background-color .15s;} .tool-card:hover{border-color:var(--border2);background:var(--surface-subtle-hover);} .tool-card-running{border-color:var(--accent-bg-strong);background:var(--accent-bg);} .tool-card-header{display:flex;align-items:center;gap:var(--space-2);padding:var(--space-1) var(--space-3);cursor:pointer;user-select:none;} .tool-card-icon{font-size:13px;flex-shrink:0;opacity:.65;} -.tool-card-badge{flex-shrink:0;font-size:10px;line-height:1.2;text-transform:uppercase;letter-spacing:.045em;font-weight:700;color:var(--accent-text);background:var(--accent-bg);border:1px solid var(--accent-bg-strong);border-radius:999px;padding:1px 6px;} + .tool-card-name{font-size:var(--font-size-xs);font-weight:600;color:var(--muted);font-family:'SF Mono',ui-monospace,monospace;flex-shrink:0;} .tool-card-preview{font-size:var(--font-size-xs);color:var(--muted);opacity:.62;flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;} .tool-card-toggle{font-size:10px;color:var(--muted);opacity:.45;flex-shrink:0;display:inline-flex;align-items:center;justify-content:center;transform-origin:center;transition:transform .18s ease;will-change:transform;} diff --git a/static/ui.js b/static/ui.js index 5f2a9360d8..50ffce7863 100644 --- a/static/ui.js +++ b/static/ui.js @@ -6987,7 +6987,6 @@ function buildToolCard(tc){
${runIndicator} ${icon} - Tool output ${esc(displayName)} ${esc(previewText)} ${hasDetail?`${li('chevron-right',12)}`:''} diff --git a/tests/test_issue2867_tool_output_visual_distinction.py b/tests/test_issue2867_tool_output_visual_distinction.py index f8daca2987..47af79ab8e 100644 --- a/tests/test_issue2867_tool_output_visual_distinction.py +++ b/tests/test_issue2867_tool_output_visual_distinction.py @@ -5,29 +5,23 @@ STYLE_CSS = (ROOT / "static" / "style.css").read_text(encoding="utf-8") -def test_tool_cards_render_persistent_tool_output_badge(): - """Tool output must remain distinguishable without relying on hover state.""" +def test_tool_cards_use_legacy_compact_header_without_tool_output_badge(): + """Tool cards keep the legacy compact header: icon, tool name, preview.""" build_start = UI_JS.index('function buildToolCard(tc){') build_end = UI_JS.index('function _syncToolCallGroupSummary', build_start) build_tool_card = UI_JS[build_start:build_end] - assert 'Tool output' in build_tool_card + assert 'tool-card-badge' not in build_tool_card + assert 'Tool output' not in build_tool_card assert '${esc(displayName)}' in build_tool_card - assert build_tool_card.index('class="tool-card-badge"') < build_tool_card.index('class="tool-card-name"') -def test_tool_card_badge_style_is_not_hover_only(): - badge_rule_start = STYLE_CSS.index('.tool-card-badge{') - badge_rule_end = STYLE_CSS.index('}', badge_rule_start) - badge_rule = STYLE_CSS[badge_rule_start:badge_rule_end] - +def test_tool_card_badge_style_is_absent(): + assert '.tool-card-badge{' not in STYLE_CSS assert '.tool-card:hover .tool-card-badge' not in STYLE_CSS - assert 'text-transform:uppercase' in badge_rule - assert 'background:var(--accent-bg)' in badge_rule - assert 'border:1px solid var(--accent-bg-strong)' in badge_rule - assert 'color:var(--accent-text)' in badge_rule -def test_tool_cards_have_persistent_accent_rail(): +def test_tool_cards_use_legacy_muted_rail(): assert '.tool-card{background:var(--surface-subtle);' in STYLE_CSS - assert 'border-left:3px solid var(--accent-bg-strong)' in STYLE_CSS + assert 'border-left:2px solid var(--border-muted)' in STYLE_CSS + assert 'border-left:3px solid var(--accent-bg-strong)' not in STYLE_CSS From b3483d943c75d538aa2208df387dc651628059dd Mon Sep 17 00:00:00 2001 From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com> Date: Sat, 30 May 2026 06:07:06 +0200 Subject: [PATCH 283/349] fix: close evicted agents from WebUI cache --- api/streaming.py | 82 +++++++++++++++---- ...est_memory_session_lifecycle_generation.py | 8 +- tests/test_streaming_agent_cache_lifecycle.py | 73 +++++++++++++++++ tests/test_v050259_sessiondb_fd_leak.py | 14 +++- 4 files changed, 154 insertions(+), 23 deletions(-) create mode 100644 tests/test_streaming_agent_cache_lifecycle.py diff --git a/api/streaming.py b/api/streaming.py index da77fef025..60c851948f 100644 --- a/api/streaming.py +++ b/api/streaming.py @@ -3609,6 +3609,69 @@ def _agent_cache_api_key_sig(resolved_api_key, credential_pool) -> str: return _hashlib.sha256((resolved_api_key or '').encode()).hexdigest()[:16] +def _lifecycle_commit_session_memory(session_id: str, *, agent=None, wait: bool = False) -> bool: + from api.session_lifecycle import commit_session_memory + + return commit_session_memory(session_id, agent=agent, wait=wait) + + +def _lifecycle_has_uncommitted_work(session_id: str) -> bool: + from api.session_lifecycle import has_uncommitted_work + + return has_uncommitted_work(session_id) + + +def _lifecycle_unregister_agent(session_id: str) -> None: + from api.session_lifecycle import unregister_agent + + unregister_agent(session_id) + + +def _close_evicted_agent_at_session_boundary(session_id: str, agent) -> bool: + """Commit and tear down an evicted cached agent at a WebUI session boundary. + + WebUI keeps AIAgent instances in an LRU cache so memory providers can carry + state across turns. When an agent is evicted, commit pending memory first; + if the lifecycle entry is clean afterwards, unregister and call + shutdown_memory_provider(messages) so provider-owned clients such as + Hindsight's aiohttp session are closed instead of being garbage-collected + later. Passing the cached transcript mirrors gateway cleanup semantics for + providers that use on_session_end(messages) during shutdown. + """ + if agent is None: + return True + + should_close_evicted_agent = True + try: + _lifecycle_commit_session_memory(session_id, agent=agent, wait=True) + if not _lifecycle_has_uncommitted_work(session_id): + _lifecycle_unregister_agent(session_id) + else: + should_close_evicted_agent = False + except Exception: + should_close_evicted_agent = False + logger.debug("Lifecycle commit on eviction failed for %s", session_id, exc_info=True) + + if not should_close_evicted_agent: + return False + + try: + shutdown_memory_provider = getattr(agent, 'shutdown_memory_provider', None) + if callable(shutdown_memory_provider): + session_messages = vars(agent).get('_session_messages', []) + shutdown_memory_provider(session_messages) + except Exception: + logger.debug("Failed to shut down evicted agent memory provider for session %s", session_id, exc_info=True) + + try: + session_db = getattr(agent, '_session_db', None) + if session_db is not None: + session_db.close() + except Exception: + logger.debug("Failed to close evicted agent session DB for session %s", session_id, exc_info=True) + return True + + def _refresh_cached_agent_runtime(agent, agent_kwargs: dict) -> bool: """Refresh volatile runtime credentials on a reused cached AIAgent. @@ -4880,24 +4943,7 @@ def _fallback_entries(_raw): for _evicted_sid, _evicted_entry in _evicted_items: try: _evicted_agent = _evicted_entry[0] if isinstance(_evicted_entry, tuple) else None - _should_close_evicted_agent = True - if _evicted_agent is not None: - try: - from api.session_lifecycle import ( - commit_session_memory as _lifecycle_commit, - has_uncommitted_work as _lifecycle_has_uncommitted_work, - unregister_agent as _lifecycle_unregister_agent, - ) - _lifecycle_commit(_evicted_sid, agent=_evicted_agent, wait=True) - if not _lifecycle_has_uncommitted_work(_evicted_sid): - _lifecycle_unregister_agent(_evicted_sid) - else: - _should_close_evicted_agent = False - except Exception: - _should_close_evicted_agent = False - logger.debug("Lifecycle commit on eviction failed for %s", _evicted_sid, exc_info=True) - if _should_close_evicted_agent and _evicted_agent is not None and getattr(_evicted_agent, '_session_db', None) is not None: - _evicted_agent._session_db.close() + _close_evicted_agent_at_session_boundary(_evicted_sid, _evicted_agent) except Exception: logger.debug("Failed to close evicted agent for session %s", _evicted_sid, exc_info=True) logger.debug('[webui] Evicted LRU agent from cache: %s', _evicted_sid) diff --git a/tests/test_memory_session_lifecycle_generation.py b/tests/test_memory_session_lifecycle_generation.py index 8b5c40227c..2132c1056f 100644 --- a/tests/test_memory_session_lifecycle_generation.py +++ b/tests/test_memory_session_lifecycle_generation.py @@ -329,8 +329,12 @@ def test_lru_eviction_commits_outside_cache_lock(): assert "commit_session_memory" not in locked_section assert "_lifecycle_commit" not in locked_section assert "SESSION_AGENT_CACHE.popitem" in locked_section - assert "_lifecycle_commit" in outside_section - assert "wait=True" in outside_section + assert "_close_evicted_agent_at_session_boundary" in outside_section + helper_start = src.index("def _close_evicted_agent_at_session_boundary") + helper_end = src.index("\ndef _refresh_cached_agent_runtime", helper_start) + helper_section = src[helper_start:helper_end] + assert "_lifecycle_commit_session_memory" in helper_section + assert "wait=True" in helper_section assert "outside the cache lock" in outside_section diff --git a/tests/test_streaming_agent_cache_lifecycle.py b/tests/test_streaming_agent_cache_lifecycle.py new file mode 100644 index 0000000000..d57aebd92f --- /dev/null +++ b/tests/test_streaming_agent_cache_lifecycle.py @@ -0,0 +1,73 @@ +from unittest.mock import MagicMock + + +def test_evicted_agent_lifecycle_commits_unregisters_and_shutdowns(monkeypatch): + import api.streaming as streaming + + events = [] + + def fake_commit(session_id, *, agent=None, wait=False): + events.append(("commit", session_id, agent, wait)) + return True + + def fake_has_uncommitted_work(session_id): + events.append(("has_uncommitted", session_id)) + return False + + def fake_unregister(session_id): + events.append(("unregister", session_id)) + + monkeypatch.setattr(streaming, "_lifecycle_commit_session_memory", fake_commit) + monkeypatch.setattr(streaming, "_lifecycle_has_uncommitted_work", fake_has_uncommitted_work) + monkeypatch.setattr(streaming, "_lifecycle_unregister_agent", fake_unregister) + + session_db = MagicMock() + agent = MagicMock() + agent._session_db = session_db + agent._session_messages = [{"role": "user", "content": "hello"}] + + streaming._close_evicted_agent_at_session_boundary("old-session", agent) + + assert ("commit", "old-session", agent, True) in events + assert ("has_uncommitted", "old-session") in events + assert ("unregister", "old-session") in events + agent.shutdown_memory_provider.assert_called_once_with(agent._session_messages) + session_db.close.assert_called_once() + + +def test_evicted_agent_lifecycle_shutdown_uses_empty_messages_when_missing(monkeypatch): + import api.streaming as streaming + + monkeypatch.setattr(streaming, "_lifecycle_commit_session_memory", lambda *a, **kw: True) + monkeypatch.setattr(streaming, "_lifecycle_has_uncommitted_work", lambda session_id: False) + monkeypatch.setattr(streaming, "_lifecycle_unregister_agent", MagicMock()) + + agent = MagicMock() + agent._session_db = MagicMock() + + streaming._close_evicted_agent_at_session_boundary("old-session", agent) + + agent.shutdown_memory_provider.assert_called_once_with([]) + agent._session_db.close.assert_called_once() + + +def test_evicted_agent_lifecycle_keeps_provider_alive_when_commit_still_dirty(monkeypatch): + import api.streaming as streaming + + def fake_commit(session_id, *, agent=None, wait=False): + return True + + def fake_has_uncommitted_work(session_id): + return True + + monkeypatch.setattr(streaming, "_lifecycle_commit_session_memory", fake_commit) + monkeypatch.setattr(streaming, "_lifecycle_has_uncommitted_work", fake_has_uncommitted_work) + monkeypatch.setattr(streaming, "_lifecycle_unregister_agent", MagicMock()) + + agent = MagicMock() + agent._session_db = MagicMock() + + streaming._close_evicted_agent_at_session_boundary("dirty-session", agent) + + agent.shutdown_memory_provider.assert_not_called() + agent._session_db.close.assert_not_called() diff --git a/tests/test_v050259_sessiondb_fd_leak.py b/tests/test_v050259_sessiondb_fd_leak.py index 80290fc7a6..6d3b748ee7 100644 --- a/tests/test_v050259_sessiondb_fd_leak.py +++ b/tests/test_v050259_sessiondb_fd_leak.py @@ -85,9 +85,17 @@ def test_lru_eviction_closes_evicted_agent_session_db(): "is the original bug shape." ) - # Positive pattern: must close on the evicted agent. - assert "_evicted_agent._session_db.close()" in block, ( - "LRU eviction must close the evicted agent\'s _session_db. " + # Positive pattern: eviction must call the lifecycle helper, and the helper + # must close the evicted agent's SessionDB after provider teardown. + assert "_close_evicted_agent_at_session_boundary(_evicted_sid, _evicted_agent)" in block, ( + "LRU eviction must route the evicted agent through the session-boundary " + "close helper." + ) + helper_start = src.index("def _close_evicted_agent_at_session_boundary") + helper_end = src.index("\ndef _refresh_cached_agent_runtime", helper_start) + helper_block = src[helper_start:helper_end] + assert "session_db.close()" in helper_block, ( + "LRU eviction helper must close the evicted agent's _session_db. " "(Opus pre-release follow-up to PR #1421.)" ) From fb7fa5bcacf4baf1743dfe02edca33fa634b45be Mon Sep 17 00:00:00 2001 From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com> Date: Sat, 30 May 2026 11:15:35 +0200 Subject: [PATCH 284/349] fix: handle Windows media and turn journal edge cases --- CHANGELOG.md | 5 +++++ api/routes.py | 10 +++++++++- api/turn_journal.py | 16 +++++++++------- tests/test_media_inline.py | 26 ++++++++++++++++++++++++++ tests/test_turn_journal_lifecycle.py | 15 +++++++++++++++ 5 files changed, 64 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8ec946546..f331ac518e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ ## [Unreleased] +### Fixed + +- Windows native runs now skip the POSIX-only turn-journal directory fsync instead of raising `AttributeError` for missing `os.O_DIRECTORY` on every submitted turn (#3170). +- `/api/media` now treats Windows cross-drive `commonpath()` comparisons as non-matches instead of 500ing when media paths and allowed roots live on different drives (#3171). + ## [v0.51.171] — 2026-05-30 — Release EQ (stage-batch53 — tool-output card badge + Neon opt-in skin) ### Added diff --git a/api/routes.py b/api/routes.py index d448a382d0..4d536bd5a1 100644 --- a/api/routes.py +++ b/api/routes.py @@ -7887,6 +7887,14 @@ def _session_media_token_allows_image_path(sid: str, target: Path, image_mimes: return False +def _path_is_within_root(child: Path, root: Path) -> bool: + """Return True when ``child`` is inside ``root`` without crashing on Windows drives.""" + try: + return os.path.commonpath([str(child), str(root)]) == str(root) + except ValueError: + return False + + def _handle_media(handler, parsed): """Serve a local file by absolute path for inline display in the chat. @@ -7963,7 +7971,7 @@ def _handle_media(handler, parsed): "image/x-icon", "image/bmp", } within_allowed = any( - _os.path.commonpath([str(target), str(root)]) == str(root) + _path_is_within_root(target, root) for root in allowed_roots if root.exists() ) diff --git a/api/turn_journal.py b/api/turn_journal.py index 58369be582..3dba35bdff 100644 --- a/api/turn_journal.py +++ b/api/turn_journal.py @@ -94,14 +94,16 @@ def append_turn_journal_event( fh.write(line) fh.flush() os.fsync(fh.fileno()) - try: - dir_fd = os.open(path.parent, os.O_DIRECTORY) + o_directory = getattr(os, "O_DIRECTORY", None) + if o_directory is not None: try: - os.fsync(dir_fd) - finally: - os.close(dir_fd) - except OSError: - pass + dir_fd = os.open(path.parent, o_directory) + try: + os.fsync(dir_fd) + finally: + os.close(dir_fd) + except OSError: + pass return payload diff --git a/tests/test_media_inline.py b/tests/test_media_inline.py index 41e84dc4c6..621da12051 100644 --- a/tests/test_media_inline.py +++ b/tests/test_media_inline.py @@ -255,6 +255,32 @@ def test_media_allowed_roots_uses_os_pathsep(self): self.assertIn(".split(_os.pathsep)", block) self.assertNotIn('.split(":")', block) + def test_path_is_within_root_treats_commonpath_valueerror_as_not_within(self): + """Windows cross-drive commonpath() errors must not crash /api/media.""" + from api import routes + + with mock.patch.object( + routes.os.path, + "commonpath", + side_effect=ValueError("Paths don't have the same drive"), + ): + self.assertFalse( + routes._path_is_within_root( + pathlib.Path("D:/outputs/card.png"), + pathlib.Path("C:/Users/agent/.hermes"), + ) + ) + + def test_path_is_within_root_accepts_child_path(self): + from api import routes + + with tempfile.TemporaryDirectory() as tmpd: + root = pathlib.Path(tmpd).resolve() + child = root / "media" / "card.png" + child.parent.mkdir() + child.write_bytes(b"png") + self.assertTrue(routes._path_is_within_root(child.resolve(), root)) + def test_media_endpoints_advertise_byte_range_support(self): routes_src = (REPO_ROOT / "api" / "routes.py").read_text(encoding="utf-8") self.assertIn("Accept-Ranges", routes_src) diff --git a/tests/test_turn_journal_lifecycle.py b/tests/test_turn_journal_lifecycle.py index 3f5a317ad9..656714d833 100644 --- a/tests/test_turn_journal_lifecycle.py +++ b/tests/test_turn_journal_lifecycle.py @@ -1,3 +1,5 @@ +import os + from api.turn_journal import ( append_turn_journal_event, append_turn_journal_event_for_stream, @@ -36,3 +38,16 @@ def test_append_turn_journal_event_for_stream_falls_back_to_new_turn_for_missing assert event["stream_id"] == "stream-missing" assert event["turn_id"] assert event["event"] == "interrupted" + + +def test_append_turn_journal_event_skips_directory_fsync_without_o_directory(tmp_path, monkeypatch): + monkeypatch.delattr(os, "O_DIRECTORY", raising=False) + + event = append_turn_journal_event( + "sid-windows", + {"event": "submitted", "content": "hello"}, + session_dir=tmp_path, + ) + + assert event["event"] == "submitted" + assert (tmp_path / "_turn_journal" / "sid-windows.jsonl").is_file() From 000e1dc9b62b3372fdc4701f720ffa89376864c7 Mon Sep 17 00:00:00 2001 From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com> Date: Sat, 30 May 2026 11:25:33 +0200 Subject: [PATCH 285/349] fix: hash dirty WebUI dev builds --- CHANGELOG.md | 4 +++ api/updates.py | 4 +++ tests/test_version_badge.py | 61 +++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8ec946546..6989bdaa3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ ## [Unreleased] +### Fixed + +- Dev-build cache-busting now includes a short hash of the tracked dirty diff, so local asset URLs change on each edit instead of staying at a constant `-dirty` suffix (#3159). + ## [v0.51.171] — 2026-05-30 — Release EQ (stage-batch53 — tool-output card badge + Neon opt-in skin) ### Added diff --git a/api/updates.py b/api/updates.py index 86c1d73875..4269e19967 100644 --- a/api/updates.py +++ b/api/updates.py @@ -195,6 +195,10 @@ def _dirty_suffix(path: Path, timeout=1) -> str: # the dirty signal; real errors (timeouts, missing git) carry a different # diagnostic and correctly suppress the suffix. if not out or out.startswith('git exited with status '): + diff, diff_ok = _run_git(['diff', '--binary', 'HEAD', '--'], path, timeout=timeout) + if diff_ok and diff: + digest = hashlib.sha1(diff.encode('utf-8', errors='replace')).hexdigest()[:8] + return f"-dirty-{digest}" return "-dirty" return "" diff --git a/tests/test_version_badge.py b/tests/test_version_badge.py index be53d5b556..27112bd56f 100644 --- a/tests/test_version_badge.py +++ b/tests/test_version_badge.py @@ -11,6 +11,7 @@ 7. server.py: server_version is not the old hardcoded string """ import importlib +import subprocess import sys import types from pathlib import Path @@ -117,6 +118,66 @@ def fake_run_git(args, cwd, timeout=10): assert result == 'v0.50.123-dirty' assert calls[1][0][:2] == ['diff-index', '--quiet'] + def test_dirty_check_hashes_tracked_diff_when_available(self, tmp_path): + """Dirty dev-build asset URLs should change on each tracked diff edit.""" + import hashlib + + diff = "diff --git a/static/ui.js b/static/ui.js\n+console.log('dev edit')\n" + expected = hashlib.sha1(diff.encode('utf-8', errors='replace')).hexdigest()[:8] + calls = [] + + def fake_run_git(args, cwd, timeout=10): + calls.append((args, timeout)) + if args[:3] == ['describe', '--tags', '--always']: + return ('v0.50.123', True) + if args[:2] == ['diff-index', '--quiet']: + return ('git exited with status 1', False) + if args[:3] == ['diff', '--binary', 'HEAD']: + return (diff, True) + return ('unexpected', False) + + result = self._fresh_detect(mock_run_git=fake_run_git, tmp_path=tmp_path) + assert result == f'v0.50.123-dirty-{expected}' + assert calls[2][0][:3] == ['diff', '--binary', 'HEAD'] + + def test_dirty_check_falls_back_when_diff_hash_unavailable(self, tmp_path): + """If the diff read fails, keep the old best-effort -dirty suffix.""" + def fake_run_git(args, cwd, timeout=10): + if args[:3] == ['describe', '--tags', '--always']: + return ('v0.50.123', True) + if args[:2] == ['diff-index', '--quiet']: + return ('git exited with status 1', False) + if args[:3] == ['diff', '--binary', 'HEAD']: + return ('git diff timed out after 1s', False) + return ('unexpected', False) + + result = self._fresh_detect(mock_run_git=fake_run_git, tmp_path=tmp_path) + assert result == 'v0.50.123-dirty' + + def test_dirty_suffix_changes_when_tracked_diff_changes(self, tmp_path): + """Real git diff hashing should produce a new suffix for each tracked edit.""" + import api.updates as upd + + def git(*args): + subprocess.run(['git', *args], cwd=tmp_path, check=True, capture_output=True, text=True) + + git('init') + git('config', 'user.name', 'Test User') + git('config', 'user.email', 'test@example.invalid') + tracked = tmp_path / 'tracked.txt' + tracked.write_text('base\n', encoding='utf-8') + git('add', 'tracked.txt') + git('commit', '-m', 'base') + + tracked.write_text('edit one\n', encoding='utf-8') + first = upd._dirty_suffix(tmp_path) + tracked.write_text('edit two\n', encoding='utf-8') + second = upd._dirty_suffix(tmp_path) + + assert first.startswith('-dirty-') + assert second.startswith('-dirty-') + assert first != second + def test_dirty_check_timeout_does_not_hide_base_version(self, tmp_path): """If dirty detection times out, keep the base version instead of unknown.""" def fake_run_git(args, cwd, timeout=10): From cb01e041fd4602830c397133893094d3d655d894 Mon Sep 17 00:00:00 2001 From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com> Date: Sat, 30 May 2026 11:35:05 +0200 Subject: [PATCH 286/349] fix: preserve tilde workspace suggestions --- CHANGELOG.md | 4 ++++ api/workspace.py | 20 +++++++++++++++++++- tests/test_sprint5.py | 44 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8ec946546..5fc3200541 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ ## [Unreleased] +### Fixed + +- Workspace path autocomplete now preserves `~/` suggestions while browsing under the user's home directory (#3173). + ## [v0.51.171] — 2026-05-30 — Release EQ (stage-batch53 — tool-output card badge + Neon opt-in skin) ### Added diff --git a/api/workspace.py b/api/workspace.py index 362b9e8774..d76f3908ee 100644 --- a/api/workspace.py +++ b/api/workspace.py @@ -468,10 +468,28 @@ def list_workspace_suggestions(prefix: str = "", limit: int = 12) -> list[str]: normalized = str(target) normalized_lower = normalized.lower() + preserve_tilde = raw.startswith("~") + home_root: Path | None = None + if preserve_tilde: + try: + home_root = Path.home().expanduser().resolve() + except Exception: + home_root = None suggestions: list[str] = [] + def format_suggestion(path: Path) -> str: + if preserve_tilde and home_root is not None: + try: + rel = path.resolve().relative_to(home_root) + if str(rel) == ".": + return "~" + return "~/" + rel.as_posix() + except (OSError, ValueError): + pass + return str(path) + def add(path: Path) -> None: - value = str(path) + value = format_suggestion(path) if value not in suggestions: suggestions.append(value) diff --git a/tests/test_sprint5.py b/tests/test_sprint5.py index dee6779ae3..f345b62610 100644 --- a/tests/test_sprint5.py +++ b/tests/test_sprint5.py @@ -108,6 +108,50 @@ def test_workspace_suggest_hidden_dirs_only_when_requested(cleanup_test_sessions assert status2 == 200 assert str(hidden) in data2["suggestions"] + +def test_workspace_suggest_preserves_tilde_prefix(monkeypatch, tmp_path): + from api import workspace + + home = tmp_path / "home" + child = home / "Projects" + child.mkdir(parents=True) + monkeypatch.setenv("HOME", str(home)) + monkeypatch.setattr(workspace, "_trusted_workspace_roots", lambda: [home.resolve()]) + + suggestions = workspace.list_workspace_suggestions("~/") + + assert "~/Projects" in suggestions + assert str(child.resolve()) not in suggestions + + +def test_workspace_suggest_preserves_tilde_prefix_for_partial_child(monkeypatch, tmp_path): + from api import workspace + + home = tmp_path / "home" + child = home / "Projects" + child.mkdir(parents=True) + monkeypatch.setenv("HOME", str(home)) + monkeypatch.setattr(workspace, "_trusted_workspace_roots", lambda: [home.resolve()]) + + suggestions = workspace.list_workspace_suggestions("~/Pro") + + assert suggestions == ["~/Projects"] + + +def test_workspace_suggest_keeps_absolute_prefix_absolute(monkeypatch, tmp_path): + from api import workspace + + home = tmp_path / "home" + child = home / "Projects" + child.mkdir(parents=True) + monkeypatch.setenv("HOME", str(home)) + monkeypatch.setattr(workspace, "_trusted_workspace_roots", lambda: [home.resolve()]) + + suggestions = workspace.list_workspace_suggestions(str(home) + "/Pro") + + assert suggestions == [str(child.resolve())] + + def test_workspace_remove(cleanup_test_sessions): _, ws = make_session_tracked(cleanup_test_sessions) child = make_workspace_child(ws, f"workspace-remove-{uuid.uuid4().hex[:6]}") From 09d2f4be2f8ff53d9bcc15bf5b11f692bdf4bdce Mon Sep 17 00:00:00 2001 From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com> Date: Sat, 30 May 2026 11:45:24 +0200 Subject: [PATCH 287/349] fix: exclude hidden snapshots from pin quota --- CHANGELOG.md | 4 +++ api/routes.py | 24 +++++++++++++-- api/streaming.py | 4 +++ ...test_compression_snapshot_runtime_clear.py | 7 +++++ tests/test_issue2508_session_pin_cap.py | 30 +++++++++++++++++++ .../test_issue2821_session_pin_state_sync.py | 5 ++-- 6 files changed, 70 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8ec946546..0fe3a78e8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ ## [Unreleased] +### Fixed + +- Hidden pre-compression snapshots no longer keep stale pin state or count toward the visible pinned-session quota (#3181). + ## [v0.51.171] — 2026-05-30 — Release EQ (stage-batch53 — tool-output card badge + Neon opt-in skin) ### Added diff --git a/api/routes.py b/api/routes.py index d448a382d0..08ef209c03 100644 --- a/api/routes.py +++ b/api/routes.py @@ -99,6 +99,25 @@ def _session_field(session, field, default=None): return getattr(session, field, default) +def _session_counts_toward_pin_quota(session) -> bool: + """Return True when a pinned session should consume visible pin quota.""" + if not _session_field(session, "pinned", False): + return False + if _session_field(session, "archived", False): + return False + if isinstance(session, dict): + row = session + elif hasattr(session, "compact"): + row = session.compact() + else: + row = { + "pre_compression_snapshot": _session_field(session, "pre_compression_snapshot", False), + "source_tag": _session_field(session, "source_tag", None), + "default_hidden": _session_field(session, "default_hidden", False), + } + return not _hide_from_default_sidebar(row) + + # ── Profile-scoped session/project filtering (#1611, #1614) ──────────────── # # Sessions and projects are stored in the WebUI sidecar without per-row @@ -2730,6 +2749,7 @@ def _keep_latest_messaging_session_per_source( merge_session_messages_append_only, _session_message_merge_key, _is_empty_partial_activity_message, + _hide_from_default_sidebar, prune_session_from_index, ensure_cron_project, is_cron_session, @@ -6509,7 +6529,7 @@ def handle_post(handler, parsed) -> bool: # so must run outside our own LOCK acquire below). persisted_pinned_ids = { _session_field(existing, "session_id", None) for existing in all_sessions() - if _session_field(existing, "pinned", False) and not _session_field(existing, "archived", False) + if _session_counts_toward_pin_quota(existing) } with LOCK: # Final authoritative count: merge persisted-pinned with the @@ -6519,7 +6539,7 @@ def handle_post(handler, parsed) -> bool: pinned_ids = set(persisted_pinned_ids) pinned_ids.update( sid for sid, existing in SESSIONS.items() - if getattr(existing, "pinned", False) and not getattr(existing, "archived", False) + if _session_counts_toward_pin_quota(existing) ) pinned_ids.discard(body["session_id"]) pinned_sessions_limit = int(load_settings().get("pinned_sessions_limit", 3) or 3) diff --git a/api/streaming.py b/api/streaming.py index da77fef025..cdb14ccded 100644 --- a/api/streaming.py +++ b/api/streaming.py @@ -2286,8 +2286,10 @@ def _preserve_pre_compression_snapshot(s, old_sid: str) -> None: # pre-existing parent_session_id lineage. saved_sid = s.session_id saved_snapshot = bool(getattr(s, 'pre_compression_snapshot', False)) + saved_pinned = bool(getattr(s, 'pinned', False)) s.session_id = old_sid s.pre_compression_snapshot = True + s.pinned = False # Stage-359 / PR #2295: clear runtime stream-state fields on the # archived snapshot so the sidebar does not reopen the parent as # a permanently-running session while the child already holds the @@ -2314,6 +2316,7 @@ def _preserve_pre_compression_snapshot(s, old_sid: str) -> None: finally: s.session_id = saved_sid s.pre_compression_snapshot = saved_snapshot + s.pinned = saved_pinned s.active_stream_id = saved_active_stream_id s.pending_user_message = saved_pending_user_message s.pending_attachments = saved_pending_attachments @@ -2326,6 +2329,7 @@ def _preserve_pre_compression_snapshot(s, old_sid: str) -> None: snapshot = Session.load(old_sid) if snapshot: snapshot.pre_compression_snapshot = True + snapshot.pinned = False # Stage-359 Opus SHOULD-FIX: clear runtime fields on the loaded # snapshot too. If the disk snapshot was last persisted while the # parent was live, it could carry a stale active_stream_id / diff --git a/tests/test_compression_snapshot_runtime_clear.py b/tests/test_compression_snapshot_runtime_clear.py index 56ca8debb2..69e79d252b 100644 --- a/tests/test_compression_snapshot_runtime_clear.py +++ b/tests/test_compression_snapshot_runtime_clear.py @@ -9,6 +9,7 @@ def __init__(self): self.session_id = "new_session" self.parent_session_id = "original_parent" self.pre_compression_snapshot = False + self.pinned = True self.active_stream_id = "live-stream" self.pending_user_message = "current prompt" self.pending_attachments = [{"name": "file.txt"}] @@ -21,6 +22,7 @@ def save(self, *, touch_updated_at=True, skip_index=False): "session_id": self.session_id, "parent_session_id": self.parent_session_id, "pre_compression_snapshot": self.pre_compression_snapshot, + "pinned": self.pinned, "active_stream_id": self.active_stream_id, "pending_user_message": self.pending_user_message, "pending_attachments": list(self.pending_attachments), @@ -43,6 +45,7 @@ def test_preserve_pre_compression_snapshot_clears_runtime_fields_while_restoring "session_id": "old_session", "parent_session_id": "original_parent", "pre_compression_snapshot": True, + "pinned": False, "active_stream_id": None, "pending_user_message": None, "pending_attachments": [], @@ -52,6 +55,7 @@ def test_preserve_pre_compression_snapshot_clears_runtime_fields_while_restoring } assert session.session_id == "new_session" assert session.pre_compression_snapshot is False + assert session.pinned is True assert session.active_stream_id == "live-stream" assert session.pending_user_message == "current prompt" assert session.pending_attachments == [{"name": "file.txt"}] @@ -59,6 +63,7 @@ def test_preserve_pre_compression_snapshot_clears_runtime_fields_while_restoring saved = json.loads((tmp_path / "old_session.json").read_text(encoding="utf-8")) assert saved["pre_compression_snapshot"] is True + assert saved["pinned"] is False assert saved["active_stream_id"] is None assert saved["pending_user_message"] is None assert saved["pending_attachments"] == [] @@ -77,6 +82,7 @@ def test_preserve_pre_compression_snapshot_load_and_mark_branch_clears_runtime_f {"role": "user", "content": "newer prompt already on disk"}, ], "pre_compression_snapshot": True, + "pinned": True, "active_stream_id": "stale-stream", "pending_user_message": "stale prompt", "pending_attachments": [{"name": "stale.txt"}], @@ -91,6 +97,7 @@ def test_preserve_pre_compression_snapshot_load_and_mark_branch_clears_runtime_f saved = json.loads((tmp_path / "old_session.json").read_text(encoding="utf-8")) assert saved["messages"] == old_payload["messages"] assert saved["pre_compression_snapshot"] is True + assert saved["pinned"] is False assert saved["active_stream_id"] is None assert saved["pending_user_message"] is None assert saved["pending_attachments"] == [] diff --git a/tests/test_issue2508_session_pin_cap.py b/tests/test_issue2508_session_pin_cap.py index f41640244c..01d533bc5a 100644 --- a/tests/test_issue2508_session_pin_cap.py +++ b/tests/test_issue2508_session_pin_cap.py @@ -2,6 +2,7 @@ import json import pathlib +from types import SimpleNamespace import urllib.error import urllib.request @@ -67,6 +68,35 @@ def test_session_pin_endpoint_caps_pinned_sessions_at_three(): post("/api/session/delete", {"session_id": sid}) +def test_hidden_pre_compression_snapshot_does_not_count_toward_pin_quota(): + from api.routes import _session_counts_toward_pin_quota + + assert _session_counts_toward_pin_quota({ + "session_id": "hidden-snapshot", + "pinned": True, + "archived": False, + "pre_compression_snapshot": True, + }) is False + assert _session_counts_toward_pin_quota({ + "session_id": "visible-session", + "pinned": True, + "archived": False, + "pre_compression_snapshot": False, + }) is True + + +def test_hidden_in_memory_snapshot_does_not_count_toward_pin_quota(): + from api.routes import _session_counts_toward_pin_quota + + snapshot = SimpleNamespace( + session_id="hidden-memory-snapshot", + pinned=True, + archived=False, + pre_compression_snapshot=True, + ) + assert _session_counts_toward_pin_quota(snapshot) is False + + def test_session_pin_cap_has_backend_and_frontend_guards(): assert 'pinned_ids = {' in ROUTES_PY assert 'pinned_ids.update(' in ROUTES_PY diff --git a/tests/test_issue2821_session_pin_state_sync.py b/tests/test_issue2821_session_pin_state_sync.py index b08b95ef60..b54ee7e539 100644 --- a/tests/test_issue2821_session_pin_state_sync.py +++ b/tests/test_issue2821_session_pin_state_sync.py @@ -41,9 +41,10 @@ class SessionLike: def test_pin_limit_snapshot_counts_index_dict_entries(): + assert "def _session_counts_toward_pin_quota(session)" in ROUTES_PY assert "_session_field(existing, \"session_id\", None)" in ROUTES_PY - assert "_session_field(existing, \"pinned\", False)" in ROUTES_PY - assert "_session_field(existing, \"archived\", False)" in ROUTES_PY + assert "_session_counts_toward_pin_quota(existing)" in ROUTES_PY + assert "_hide_from_default_sidebar(row)" in ROUTES_PY start = ROUTES_PY.find("persisted_pinned_ids = {") assert start != -1, "persisted pin snapshot not found" end = ROUTES_PY.find("with LOCK:", start) From d57854807a9518eabef5a96026989e08dfb473ab Mon Sep 17 00:00:00 2001 From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com> Date: Sat, 30 May 2026 11:02:54 +0200 Subject: [PATCH 288/349] fix: keep tool cards anchored during history paging --- CHANGELOG.md | 4 +++ api/routes.py | 12 +++++++-- static/sessions.js | 37 ++++++++++++++++++-------- tests/test_issue401.py | 8 +++--- tests/test_session_tail_payload.py | 10 +++++-- tests/test_tool_call_history_paging.py | 27 +++++++++++++++++++ 6 files changed, 79 insertions(+), 19 deletions(-) create mode 100644 tests/test_tool_call_history_paging.py diff --git a/CHANGELOG.md b/CHANGELOG.md index c8ec946546..6ad5761e4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ ## [Unreleased] +### Fixed + +- Tool-call cards stay anchored when scrolling back through paginated history; legacy session-level tool-call indices are rebased to the returned message window and the browser refreshes tool-call anchors whenever a larger history window is loaded (#3120). + ## [v0.51.171] — 2026-05-30 — Release EQ (stage-batch53 — tool-output card badge + Neon opt-in skin) ### Added diff --git a/api/routes.py b/api/routes.py index d448a382d0..665bbc8c54 100644 --- a/api/routes.py +++ b/api/routes.py @@ -2257,7 +2257,13 @@ def _messages_include_tool_metadata(messages) -> bool: def _tool_calls_for_message_window(tool_calls, start_idx: int, message_count: int) -> list: - """Keep session-level tool calls that point into a returned message window.""" + """Keep session-level tool calls that point into a returned message window. + + ``assistant_msg_idx`` is stored in the full transcript coordinate space, but + the frontend renders the returned ``messages`` array from index 0. Rebase the + index into the returned window so legacy session-level tool cards still + anchor to their visible assistant turn after paginated loads. + """ if not isinstance(tool_calls, list) or message_count <= 0: return [] end_idx = start_idx + message_count @@ -2269,7 +2275,9 @@ def _tool_calls_for_message_window(tool_calls, start_idx: int, message_count: in if isinstance(assistant_idx, bool) or not isinstance(assistant_idx, int): continue if start_idx <= assistant_idx < end_idx: - filtered.append(tool_call) + rebased = dict(tool_call) + rebased["assistant_msg_idx"] = assistant_idx - start_idx + filtered.append(rebased) return filtered diff --git a/static/sessions.js b/static/sessions.js index 0c89c1dabe..8a9a4ed40f 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -1310,6 +1310,29 @@ let _messagesTruncated = false; // Older messages are loaded on-demand via _loadOlderMessages(). const _INITIAL_MSG_LIMIT = 30; +function _syncToolCallsForLoadedMessages(messages, sessionToolCalls, windowOffset=0){ + const msgs=Array.isArray(messages)?messages:[]; + const hasMessageToolMetadata=msgs.some(m=>{ + if(!m) return false; + const hasTc=Array.isArray(m.tool_calls)&&m.tool_calls.length>0; + const hasTu=Array.isArray(m.content)&&m.content.some(p=>p&&p.type==='tool_use'); + return hasTc||hasTu; + }); + if(!hasMessageToolMetadata&&Array.isArray(sessionToolCalls)&&sessionToolCalls.length){ + const offset=Number.isFinite(Number(windowOffset))?Number(windowOffset):0; + S.toolCalls=sessionToolCalls.map(tc=>{ + const copy={...tc,done:true}; + const idx=copy.assistant_msg_idx; + if(Number.isInteger(idx)&&idx>=offset&&idx 0 && S.messages[0] && S.messages[0].role) { @@ -1327,17 +1350,7 @@ async function _ensureMessagesLoaded(sid) { // toast on every mobile message (SSE/visibility events trigger this reload path // more aggressively on mobile). let msgs = (data.session.messages || []).filter(m => m && m.role); - // Check for tool-call metadata on messages (for tool-call card rendering) - const hasMessageToolMetadata = msgs.some(m => { - const hasTc = Array.isArray(m.tool_calls) && m.tool_calls.length > 0; - const hasTu = Array.isArray(m.content) && m.content.some(p => p && p.type === 'tool_use'); - return hasTc || hasTu; - }); - if (!hasMessageToolMetadata && data.session.tool_calls && data.session.tool_calls.length) { - S.toolCalls = data.session.tool_calls.map(tc => ({...tc, done: true})); - } else { - S.toolCalls = []; - } + _syncToolCallsForLoadedMessages(msgs, data.session.tool_calls, data.session._messages_offset||0); clearLiveToolCards(); // #3018: preserve client-side ephemeral turn fields (_turnUsage, _turnDuration, // _turnTps, _gatewayRouting, _statusCard) across the loadSession replace. @@ -1500,6 +1513,7 @@ async function _loadOlderMessages() { const container = $('messages'); const prevScrollH = container ? container.scrollHeight : 0; S.messages = nextMessages; + _syncToolCallsForLoadedMessages(nextMessages, responseSession.tool_calls, responseSession._messages_offset||0); // renderMessages() windows long transcripts from the end. If we do not // expand that window before rendering, the newly prepended page stays // hidden and the "hidden" counter rises while the viewport appears stuck. @@ -1584,6 +1598,7 @@ async function _ensureAllMessagesLoaded() { S.messages = msgs; _messagesTruncated = false; _oldestIdx = 0; + _syncToolCallsForLoadedMessages(msgs, data.session.tool_calls, data.session._messages_offset||0); if (S.session && S.session.session_id === sid) { S.session.message_count = Number(data.session.message_count || msgs.length); } diff --git a/tests/test_issue401.py b/tests/test_issue401.py index 174645e433..8519a20020 100644 --- a/tests/test_issue401.py +++ b/tests/test_issue401.py @@ -28,10 +28,10 @@ def test_loadsession_preserves_tool_rows(): def test_loadsession_uses_session_toolcalls_only_as_fallback(): """Session summaries are the fallback, not the primary reload source.""" - assert ("if(!hasMessageToolMetadata&&data.session.tool_calls&&data.session.tool_calls.length)" in SESSIONS_JS or - "if (!hasMessageToolMetadata && data.session.tool_calls && data.session.tool_calls.length)" in SESSIONS_JS) - assert ("S.toolCalls=(data.session.tool_calls||[]).map(tc=>({...tc,done:true}));" in SESSIONS_JS or - "S.toolCalls = data.session.tool_calls.map(tc => ({...tc, done: true}));" in SESSIONS_JS) + assert "function _syncToolCallsForLoadedMessages(messages, sessionToolCalls, windowOffset=0)" in SESSIONS_JS + assert "if(!hasMessageToolMetadata&&Array.isArray(sessionToolCalls)&&sessionToolCalls.length)" in SESSIONS_JS + assert "const offset=Number.isFinite(Number(windowOffset))?Number(windowOffset):0;" in SESSIONS_JS + assert "copy.assistant_msg_idx=idx-offset;" in SESSIONS_JS assert "S.toolCalls=[];" in SESSIONS_JS diff --git a/tests/test_session_tail_payload.py b/tests/test_session_tail_payload.py index da6cad85f8..82e9aee0fa 100644 --- a/tests/test_session_tail_payload.py +++ b/tests/test_session_tail_payload.py @@ -92,7 +92,10 @@ def test_tail_window_keeps_only_visible_session_tool_calls_for_legacy_messages_w payload = _invoke(session) assert payload["messages"] == [session.messages[-1]] - assert payload["tool_calls"] == [session.tool_calls[-1]] + assert payload["tool_calls"] == [ + {"name": "visible-tool", "snippet": "visible snippet", "assistant_msg_idx": 0} + ] + assert session.tool_calls[-1]["assistant_msg_idx"] == 1 def test_full_load_keeps_all_session_tool_calls_for_legacy_messages_without_metadata(): @@ -129,5 +132,8 @@ def test_msg_before_window_keeps_only_that_page_session_tool_calls(): ) assert payload["messages"] == session.messages[1:3] - assert payload["tool_calls"] == [session.tool_calls[0]] + assert payload["tool_calls"] == [ + {"name": "first-page-tool", "snippet": "kept", "assistant_msg_idx": 0} + ] + assert session.tool_calls[0]["assistant_msg_idx"] == 1 assert payload["_messages_offset"] == 1 diff --git a/tests/test_tool_call_history_paging.py b/tests/test_tool_call_history_paging.py new file mode 100644 index 0000000000..218d383fc5 --- /dev/null +++ b/tests/test_tool_call_history_paging.py @@ -0,0 +1,27 @@ +from pathlib import Path + + +ROOT = Path(__file__).resolve().parents[1] +SESSIONS_JS = (ROOT / "static" / "sessions.js").read_text(encoding="utf-8") + + +def test_sessions_js_resyncs_tool_calls_after_history_window_replacement(): + """History paging replaces S.messages with a larger window. + + Legacy sessions keep tool card data in session.tool_calls, so that side data + must be refreshed alongside the message window. Otherwise renderMessages() + can keep stale anchors and show unloaded/thinking placeholders while the + user scrolls through history. + """ + assert "function _syncToolCallsForLoadedMessages(messages, sessionToolCalls, windowOffset=0)" in SESSIONS_JS + assert "_syncToolCallsForLoadedMessages(msgs, data.session.tool_calls, data.session._messages_offset||0);" in SESSIONS_JS + assert "S.messages = nextMessages;\n _syncToolCallsForLoadedMessages(nextMessages, responseSession.tool_calls, responseSession._messages_offset||0);" in SESSIONS_JS + assert "S.messages = msgs;\n _messagesTruncated = false;\n _oldestIdx = 0;\n _syncToolCallsForLoadedMessages(msgs, data.session.tool_calls, data.session._messages_offset||0);" in SESSIONS_JS + + +def test_sessions_js_clears_session_tool_calls_when_messages_have_own_metadata(): + assert "const hasTc=Array.isArray(m.tool_calls)&&m.tool_calls.length>0;" in SESSIONS_JS + assert "const hasTu=Array.isArray(m.content)&&m.content.some(p=>p&&p.type==='tool_use');" in SESSIONS_JS + assert "const offset=Number.isFinite(Number(windowOffset))?Number(windowOffset):0;" in SESSIONS_JS + assert "const copy={...tc,done:true};" in SESSIONS_JS + assert "S.toolCalls=[];" in SESSIONS_JS From b891e4fe7717ff206dec47662f9179a8b23a497e Mon Sep 17 00:00:00 2001 From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com> Date: Sat, 30 May 2026 16:10:52 +0200 Subject: [PATCH 289/349] fix: avoid double rebasing legacy tool cards --- static/sessions.js | 18 +++++----------- tests/test_issue401.py | 30 +++++++++++++++++++++++--- tests/test_session_tail_payload.py | 7 ++++-- tests/test_tool_call_history_paging.py | 13 +++++------ 4 files changed, 44 insertions(+), 24 deletions(-) diff --git a/static/sessions.js b/static/sessions.js index 8a9a4ed40f..a4ae889cb6 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -1310,7 +1310,7 @@ let _messagesTruncated = false; // Older messages are loaded on-demand via _loadOlderMessages(). const _INITIAL_MSG_LIMIT = 30; -function _syncToolCallsForLoadedMessages(messages, sessionToolCalls, windowOffset=0){ +function _syncToolCallsForLoadedMessages(messages, sessionToolCalls){ const msgs=Array.isArray(messages)?messages:[]; const hasMessageToolMetadata=msgs.some(m=>{ if(!m) return false; @@ -1319,15 +1319,7 @@ function _syncToolCallsForLoadedMessages(messages, sessionToolCalls, windowOffse return hasTc||hasTu; }); if(!hasMessageToolMetadata&&Array.isArray(sessionToolCalls)&&sessionToolCalls.length){ - const offset=Number.isFinite(Number(windowOffset))?Number(windowOffset):0; - S.toolCalls=sessionToolCalls.map(tc=>{ - const copy={...tc,done:true}; - const idx=copy.assistant_msg_idx; - if(Number.isInteger(idx)&&idx>=offset&&idx({...tc,done:true})); }else{ S.toolCalls=[]; } @@ -1350,7 +1342,7 @@ async function _ensureMessagesLoaded(sid) { // toast on every mobile message (SSE/visibility events trigger this reload path // more aggressively on mobile). let msgs = (data.session.messages || []).filter(m => m && m.role); - _syncToolCallsForLoadedMessages(msgs, data.session.tool_calls, data.session._messages_offset||0); + _syncToolCallsForLoadedMessages(msgs, data.session.tool_calls); clearLiveToolCards(); // #3018: preserve client-side ephemeral turn fields (_turnUsage, _turnDuration, // _turnTps, _gatewayRouting, _statusCard) across the loadSession replace. @@ -1513,7 +1505,7 @@ async function _loadOlderMessages() { const container = $('messages'); const prevScrollH = container ? container.scrollHeight : 0; S.messages = nextMessages; - _syncToolCallsForLoadedMessages(nextMessages, responseSession.tool_calls, responseSession._messages_offset||0); + _syncToolCallsForLoadedMessages(nextMessages, responseSession.tool_calls); // renderMessages() windows long transcripts from the end. If we do not // expand that window before rendering, the newly prepended page stays // hidden and the "hidden" counter rises while the viewport appears stuck. @@ -1598,7 +1590,7 @@ async function _ensureAllMessagesLoaded() { S.messages = msgs; _messagesTruncated = false; _oldestIdx = 0; - _syncToolCallsForLoadedMessages(msgs, data.session.tool_calls, data.session._messages_offset||0); + _syncToolCallsForLoadedMessages(msgs, data.session.tool_calls); if (S.session && S.session.session_id === sid) { S.session.message_count = Number(data.session.message_count || msgs.length); } diff --git a/tests/test_issue401.py b/tests/test_issue401.py index 8519a20020..ab8b3c260a 100644 --- a/tests/test_issue401.py +++ b/tests/test_issue401.py @@ -28,10 +28,10 @@ def test_loadsession_preserves_tool_rows(): def test_loadsession_uses_session_toolcalls_only_as_fallback(): """Session summaries are the fallback, not the primary reload source.""" - assert "function _syncToolCallsForLoadedMessages(messages, sessionToolCalls, windowOffset=0)" in SESSIONS_JS + assert "function _syncToolCallsForLoadedMessages(messages, sessionToolCalls)" in SESSIONS_JS assert "if(!hasMessageToolMetadata&&Array.isArray(sessionToolCalls)&&sessionToolCalls.length)" in SESSIONS_JS - assert "const offset=Number.isFinite(Number(windowOffset))?Number(windowOffset):0;" in SESSIONS_JS - assert "copy.assistant_msg_idx=idx-offset;" in SESSIONS_JS + assert "windowOffset" not in SESSIONS_JS + assert "copy.assistant_msg_idx=idx-offset;" not in SESSIONS_JS assert "S.toolCalls=[];" in SESSIONS_JS @@ -114,3 +114,27 @@ def test_reload_uses_session_summary_when_messages_have_no_tool_metadata(): assert result["has_metadata"] is False assert result["fallback_len"] == 1 assert result["done_flag"] is True + + +def test_rebased_legacy_toolcalls_stay_distinct_in_paged_window(): + """Backend-rebased legacy tool calls must not be rebased a second time.""" + result = _run_js(""" + const messages = [ + { role: 'assistant', content: 'first legacy page row' }, + { role: 'assistant', content: 'second legacy page row' } + ]; + const sessionToolCalls = [ + { name: 'first_tool', assistant_msg_idx: 0, snippet: 'first' }, + { name: 'second_tool', assistant_msg_idx: 1, snippet: 'second' } + ]; + const loaded = loadSessionShape(messages, sessionToolCalls); + const renderedRawIdxs = messages.map((_, idx) => idx); + process.stdout.write(JSON.stringify({ + indices: loaded.toolCalls.map(tc => tc.assistant_msg_idx), + distinct_indices: new Set(loaded.toolCalls.map(tc => tc.assistant_msg_idx)).size, + anchors_visible: loaded.toolCalls.every(tc => renderedRawIdxs.includes(tc.assistant_msg_idx)) + })); + """) + assert result["indices"] == [0, 1] + assert result["distinct_indices"] == 2 + assert result["anchors_visible"] is True diff --git a/tests/test_session_tail_payload.py b/tests/test_session_tail_payload.py index 82e9aee0fa..dee5600c48 100644 --- a/tests/test_session_tail_payload.py +++ b/tests/test_session_tail_payload.py @@ -117,11 +117,12 @@ def test_msg_before_window_keeps_only_that_page_session_tool_calls(): session = _FakeSession([ {"role": "user", "content": "first"}, {"role": "assistant", "content": "second legacy message"}, - {"role": "user", "content": "third"}, + {"role": "assistant", "content": "third legacy message"}, {"role": "assistant", "content": "fourth legacy message"}, ]) session.tool_calls = [ {"name": "first-page-tool", "snippet": "kept", "assistant_msg_idx": 1}, + {"name": "second-page-tool", "snippet": "also kept", "assistant_msg_idx": 2}, {"name": "tail-tool", "snippet": "not in page", "assistant_msg_idx": 3}, {"name": "unindexed-tool", "snippet": "cannot place"}, ] @@ -133,7 +134,9 @@ def test_msg_before_window_keeps_only_that_page_session_tool_calls(): assert payload["messages"] == session.messages[1:3] assert payload["tool_calls"] == [ - {"name": "first-page-tool", "snippet": "kept", "assistant_msg_idx": 0} + {"name": "first-page-tool", "snippet": "kept", "assistant_msg_idx": 0}, + {"name": "second-page-tool", "snippet": "also kept", "assistant_msg_idx": 1}, ] assert session.tool_calls[0]["assistant_msg_idx"] == 1 + assert session.tool_calls[1]["assistant_msg_idx"] == 2 assert payload["_messages_offset"] == 1 diff --git a/tests/test_tool_call_history_paging.py b/tests/test_tool_call_history_paging.py index 218d383fc5..23cf9b3441 100644 --- a/tests/test_tool_call_history_paging.py +++ b/tests/test_tool_call_history_paging.py @@ -13,15 +13,16 @@ def test_sessions_js_resyncs_tool_calls_after_history_window_replacement(): can keep stale anchors and show unloaded/thinking placeholders while the user scrolls through history. """ - assert "function _syncToolCallsForLoadedMessages(messages, sessionToolCalls, windowOffset=0)" in SESSIONS_JS - assert "_syncToolCallsForLoadedMessages(msgs, data.session.tool_calls, data.session._messages_offset||0);" in SESSIONS_JS - assert "S.messages = nextMessages;\n _syncToolCallsForLoadedMessages(nextMessages, responseSession.tool_calls, responseSession._messages_offset||0);" in SESSIONS_JS - assert "S.messages = msgs;\n _messagesTruncated = false;\n _oldestIdx = 0;\n _syncToolCallsForLoadedMessages(msgs, data.session.tool_calls, data.session._messages_offset||0);" in SESSIONS_JS + assert "function _syncToolCallsForLoadedMessages(messages, sessionToolCalls)" in SESSIONS_JS + assert "_syncToolCallsForLoadedMessages(msgs, data.session.tool_calls);" in SESSIONS_JS + assert "S.messages = nextMessages;\n _syncToolCallsForLoadedMessages(nextMessages, responseSession.tool_calls);" in SESSIONS_JS + assert "S.messages = msgs;\n _messagesTruncated = false;\n _oldestIdx = 0;\n _syncToolCallsForLoadedMessages(msgs, data.session.tool_calls);" in SESSIONS_JS def test_sessions_js_clears_session_tool_calls_when_messages_have_own_metadata(): assert "const hasTc=Array.isArray(m.tool_calls)&&m.tool_calls.length>0;" in SESSIONS_JS assert "const hasTu=Array.isArray(m.content)&&m.content.some(p=>p&&p.type==='tool_use');" in SESSIONS_JS - assert "const offset=Number.isFinite(Number(windowOffset))?Number(windowOffset):0;" in SESSIONS_JS - assert "const copy={...tc,done:true};" in SESSIONS_JS + assert "windowOffset" not in SESSIONS_JS + assert "copy.assistant_msg_idx=idx-offset;" not in SESSIONS_JS + assert "S.toolCalls=sessionToolCalls.map(tc=>({...tc,done:true}));" in SESSIONS_JS assert "S.toolCalls=[];" in SESSIONS_JS From 4639d355eed12f8a979fa26b33248262fd3e3866 Mon Sep 17 00:00:00 2001 From: ai-ag2026 Date: Sat, 30 May 2026 16:31:24 +0200 Subject: [PATCH 290/349] test: cover hidden snapshot pin quota route --- tests/test_issue2508_session_pin_cap.py | 67 ++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/tests/test_issue2508_session_pin_cap.py b/tests/test_issue2508_session_pin_cap.py index 01d533bc5a..b49855c04d 100644 --- a/tests/test_issue2508_session_pin_cap.py +++ b/tests/test_issue2508_session_pin_cap.py @@ -2,11 +2,12 @@ import json import pathlib +import time from types import SimpleNamespace import urllib.error import urllib.request -from tests._pytest_port import BASE +from tests._pytest_port import BASE, TEST_STATE_DIR ROOT = pathlib.Path(__file__).resolve().parent.parent @@ -42,6 +43,41 @@ def make_session(created): return sid + +def inject_hidden_pinned_snapshot(sid="hidden-pinned-snapshot"): + """Add a persisted legacy hidden snapshot without touching server memory.""" + sessions_dir = TEST_STATE_DIR / "sessions" + sessions_dir.mkdir(parents=True, exist_ok=True) + now = time.time() + row = { + "session_id": sid, + "title": "Hidden pinned snapshot", + "workspace": str(TEST_STATE_DIR / "test-workspace"), + "model": "test/pin-cap", + "created_at": now, + "updated_at": now, + "last_message_at": now, + "message_count": 1, + "messages": [{"role": "user", "content": "legacy hidden snapshot"}], + "tool_calls": [], + "pinned": True, + "archived": False, + "pre_compression_snapshot": True, + "_show_pre_compression_snapshot": False, + } + (sessions_dir / f"{sid}.json").write_text(json.dumps(row), encoding="utf-8") + index_path = sessions_dir / "_index.json" + try: + index = json.loads(index_path.read_text(encoding="utf-8")) + except (FileNotFoundError, json.JSONDecodeError): + index = [] + compact = {k: v for k, v in row.items() if k not in {"messages", "tool_calls"}} + index = [item for item in index if item.get("session_id") != sid] + index.append(compact) + index_path.write_text(json.dumps(index), encoding="utf-8") + return sid + + def test_session_pin_endpoint_caps_pinned_sessions_at_three(): created = [] try: @@ -68,6 +104,35 @@ def test_session_pin_endpoint_caps_pinned_sessions_at_three(): post("/api/session/delete", {"session_id": sid}) +def test_session_pin_endpoint_ignores_hidden_snapshot_when_enforcing_cap(): + created = [] + hidden_sid = "hidden-pinned-snapshot-quota-route" + try: + hidden = inject_hidden_pinned_snapshot(hidden_sid) + pinned = [make_session(created) for _ in range(2)] + for sid in pinned: + d, status = post("/api/session/pin", {"session_id": sid, "pinned": True}) + assert status == 200 + assert d["session"]["pinned"] is True + + third_visible = make_session(created) + d, status = post("/api/session/pin", {"session_id": third_visible, "pinned": True}) + assert status == 200, d + assert d["session"]["pinned"] is True + assert hidden not in {third_visible, *pinned} + finally: + for sid in created: + post("/api/session/delete", {"session_id": sid}) + (TEST_STATE_DIR / "sessions" / f"{hidden_sid}.json").unlink(missing_ok=True) + index_path = TEST_STATE_DIR / "sessions" / "_index.json" + try: + index = json.loads(index_path.read_text(encoding="utf-8")) + index = [item for item in index if item.get("session_id") != hidden_sid] + index_path.write_text(json.dumps(index), encoding="utf-8") + except (FileNotFoundError, json.JSONDecodeError): + pass + + def test_hidden_pre_compression_snapshot_does_not_count_toward_pin_quota(): from api.routes import _session_counts_toward_pin_quota From 71e6eabb2980d12c11c792cbb0b662913ffa89be Mon Sep 17 00:00:00 2001 From: mysoul12138 <839465496@qq.com> Date: Sat, 30 May 2026 23:09:57 +0800 Subject: [PATCH 291/349] fix: let cron sessions bypass CLI_VISIBLE_SESSION_LIMIT for project chips (#3172) When state.db has many non-cron sessions, the normal sidebar query caps at CLI_VISIBLE_SESSION_LIMIT (20) rows ordered by latest activity. Older cron runs get squeezed out before _include_project_hidden_background_sidebar_sessions can rescue them, making them invisible under their project chip. Add a second-pass cron-only query with a higher cap (CRON_PROJECT_CHIP_LIMIT=200) that merges into the CLI session list. The project-chip rescue layer then marks them default_hidden so they stay addressable without polluting the default sidebar window. Verification: regression test seeds 25+ newer non-cron sessions and asserts the older messageful cron session still appears with project_id set. --- api/models.py | 92 ++++++++++++ tests/test_claude_code_session_import.py | 10 +- tests/test_issue3172_cron_session_limit.py | 165 +++++++++++++++++++++ 3 files changed, 265 insertions(+), 2 deletions(-) create mode 100644 tests/test_issue3172_cron_session_limit.py diff --git a/api/models.py b/api/models.py index aa80bfcfb9..725876dd0c 100644 --- a/api/models.py +++ b/api/models.py @@ -29,6 +29,11 @@ logger = logging.getLogger(__name__) CLI_VISIBLE_SESSION_LIMIT = 20 +# How many messageful cron sessions to surface in the project-chip layer. +# Needs to exceed CLI_VISIBLE_SESSION_LIMIT so older cron runs stay +# addressable even when many newer non-cron sessions dominate the default +# sidebar window (#3172). +CRON_PROJECT_CHIP_LIMIT = 200 _CLI_SESSIONS_CACHE_TTL_SECONDS = 5.0 _CLI_SESSIONS_CACHE_LOCK = threading.Lock() _CLI_SESSIONS_CACHE = {} @@ -3435,6 +3440,93 @@ def _cron_pid(): 'is_cli_session': True, }) + # --- Second pass: fetch cron sessions that may have been squeezed out + # of the default window by more-recent non-cron sessions. + # The normal sidebar query caps at CLI_VISIBLE_SESSION_LIMIT (20) rows; + # once 20 newer sessions exist, older cron runs vanish from the payload + # before _include_project_hidden_background_sidebar_sessions can rescue + # them (#3172). A separate, higher-capped cron-only pass ensures they + # stay addressable under their project chip. + existing_sids = {s['session_id'] for s in cli_sessions} + try: + cron_excluded = tuple( + s for s in ('webui', 'claude-code') # keep only 'cron' + ) + for row in read_importable_agent_session_rows( + db_path, + limit=CRON_PROJECT_CHIP_LIMIT, + log=logger, + exclude_sources=cron_excluded, + ): + sid = row['id'] + if sid in existing_sids: + continue + _source = row['source'] or 'cli' + if _source != 'cron': + continue + raw_ts = row['last_activity'] or row['started_at'] + _title = row['title'] + if not _title and sid.startswith('cron_'): + parts = sid.split('_') + if len(parts) >= 3: + _job_id = parts[1] + try: + _jobs_path = hermes_home / 'cron' / 'jobs.json' + if _jobs_path.exists(): + import json as _json + _jobs_data = _json.loads(_jobs_path.read_text()) + for _j in _jobs_data.get('jobs', []): + if _j.get('id') == _job_id: + _title = _j.get('name') or _title + break + except Exception: + pass + try: + _webui_meta = Session.load_metadata_only(sid) + if _webui_meta and getattr(_webui_meta, 'title', None): + _title = _webui_meta.title + except Exception: + pass + _display_title = _title or 'Cron Session' + cli_sessions.append({ + 'session_id': sid, + 'title': _display_title, + 'workspace': str(get_last_workspace()), + 'model': row['model'] or None, + 'message_count': row['message_count'] or row['actual_message_count'] or 0, + 'created_at': row['started_at'], + 'updated_at': raw_ts, + 'pinned': False, + 'archived': False, + 'project_id': _cron_pid(), + 'profile': _cli_profile, + 'source_tag': 'cron', + 'raw_source': row.get('raw_source'), + 'user_id': row.get('user_id'), + 'chat_id': row.get('chat_id') or row.get('origin_chat_id'), + 'chat_type': row.get('chat_type'), + 'thread_id': row.get('thread_id'), + 'session_key': row.get('session_key'), + 'platform': row.get('platform'), + 'session_source': row.get('session_source'), + 'source_label': row.get('source_label'), + 'parent_session_id': row.get('parent_session_id'), + 'parent_title': row.get('parent_title'), + 'parent_source': row.get('parent_source'), + 'relationship_type': row.get('relationship_type'), + '_parent_lineage_root_id': row.get('_parent_lineage_root_id'), + 'end_reason': row.get('end_reason'), + 'actual_message_count': row.get('actual_message_count'), + 'user_message_count': row.get('actual_user_message_count'), + '_lineage_root_id': row.get('_lineage_root_id'), + '_lineage_tip_id': row.get('_lineage_tip_id'), + '_compression_segment_count': row.get('_compression_segment_count'), + 'is_cli_session': True, + }) + existing_sids.add(sid) + except Exception: + logger.debug("Cron project-chip second pass failed", exc_info=True) + return cli_sessions diff --git a/tests/test_claude_code_session_import.py b/tests/test_claude_code_session_import.py index fb36d799ec..3fd4c5cc1f 100644 --- a/tests/test_claude_code_session_import.py +++ b/tests/test_claude_code_session_import.py @@ -164,9 +164,15 @@ def fake_rows(_db_path, **_kwargs): Path(f"{db_path}-wal").write_text("new wal contents", encoding="utf-8") second = models.get_cli_sessions() - assert calls == 2 + # Two calls to get_cli_sessions() × 2 invocations each (first pass + + # second cron-only pass) = 4 total calls to the mock. + assert calls == 4 + # First pass of first call returned message_count=1 (calls was 1). assert first[0]["message_count"] == 1 - assert second[0]["message_count"] == 2 + # First pass of second call returned message_count=3 (calls was 3; + # the second pass incremented calls to 2 and 4 but cron-only filter + # excluded the cli-source session from both second passes). + assert second[0]["message_count"] == 3 def test_session_import_cli_returns_read_only_claude_code_payload(monkeypatch, tmp_path): diff --git a/tests/test_issue3172_cron_session_limit.py b/tests/test_issue3172_cron_session_limit.py new file mode 100644 index 0000000000..e8b91b835b --- /dev/null +++ b/tests/test_issue3172_cron_session_limit.py @@ -0,0 +1,165 @@ +"""Regression tests for #3172: cron sessions surviving CLI_VISIBLE_SESSION_LIMIT. + +When state.db has many more-recent non-cron sessions, the normal sidebar +query (capped at CLI_VISIBLE_SESSION_LIMIT=20) drops older cron runs before +the project-chip rescue can process them. The second-pass cron-only query +must bring them back so they stay addressable under their project chip. +""" + +import json +import sqlite3 + +import pytest + +from api import models + + +def _make_state_db(db_path, sessions, messages=None): + """Create a minimal state.db with the given sessions and messages.""" + conn = sqlite3.connect(str(db_path)) + conn.execute(""" + CREATE TABLE IF NOT EXISTS sessions ( + id TEXT PRIMARY KEY, + title TEXT, + model TEXT, + message_count INTEGER, + started_at REAL, + source TEXT + ) + """) + conn.execute(""" + CREATE TABLE IF NOT EXISTS messages ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + session_id TEXT, + timestamp REAL, + role TEXT + ) + """) + for sid, title, source, started_at in sessions: + conn.execute( + "INSERT INTO sessions (id, title, model, message_count, started_at, source) " + "VALUES (?, ?, ?, ?, ?, ?)", + (sid, title, "gpt-x", 1, started_at, source), + ) + for sid, ts, role in (messages or []): + conn.execute( + "INSERT INTO messages (session_id, timestamp, role) VALUES (?, ?, ?)", + (sid, ts, role), + ) + conn.commit() + conn.close() + + +@pytest.fixture +def fake_hermes_home(tmp_path, monkeypatch): + """Point get_cli_sessions() at a temporary HERMES_HOME.""" + home = tmp_path / "hermes" + home.mkdir() + + import api.profiles as profiles + monkeypatch.setattr(profiles, "get_active_hermes_home", lambda: home) + monkeypatch.setattr(profiles, "get_active_profile_name", lambda: None) + + # Pre-create a cron project so _cron_pid() returns a stable ID. + projects_dir = home / "projects" + projects_dir.mkdir() + (projects_dir / "projects.json").write_text( + json.dumps({"projects": [{"id": "cron-project", "name": "Cron Jobs"}]}), + encoding="utf-8", + ) + + return home + + +def test_cron_sessions_survive_when_outnumbered_by_recent_sessions(fake_hermes_home, monkeypatch): + """Cron sessions must appear even when 25+ newer non-cron sessions fill + the default sidebar window (#3172).""" + # Patch CLI_VISIBLE_SESSION_LIMIT to a small value to make the test + # deterministic regardless of the real constant. + monkeypatch.setattr(models, "CLI_VISIBLE_SESSION_LIMIT", 5) + monkeypatch.setattr(models, "CRON_PROJECT_CHIP_LIMIT", 200) + + db_path = fake_hermes_home / "state.db" + + # 25 non-cron sessions, all more recent than the cron session. + non_cron = [ + (f"cli-session-{i:02d}", f"CLI Session {i}", "cli", 1700000100.0 + i) + for i in range(25) + ] + # 1 older cron session with messages. + cron = [("cron_abc123_20260501", "Daily digest", "cron", 1700000000.0)] + + _make_state_db(db_path, non_cron + cron, messages=[ + ("cron_abc123_20260501", 1700000001.0, "assistant"), + ]) + + sessions = models.get_cli_sessions() + + cron_sessions = [s for s in sessions if s.get("source_tag") == "cron"] + assert len(cron_sessions) >= 1, ( + f"Expected at least 1 cron session in result, got {len(cron_sessions)}. " + f"Total sessions returned: {len(sessions)}" + ) + cron_s = cron_sessions[0] + assert cron_s["session_id"] == "cron_abc123_20260501" + assert cron_s["project_id"] is not None, "Cron session should have project_id set" + + +def test_cron_sessions_deduplicated_across_passes(fake_hermes_home, monkeypatch): + """Sessions returned by both the default and cron-only pass must not + appear twice.""" + monkeypatch.setattr(models, "CLI_VISIBLE_SESSION_LIMIT", 50) + monkeypatch.setattr(models, "CRON_PROJECT_CHIP_LIMIT", 200) + + db_path = fake_hermes_home / "state.db" + + # Only 3 sessions total — all fit within CLI_VISIBLE_SESSION_LIMIT. + sessions_data = [ + ("cli-1", "Normal", "cli", 1700000100.0), + ("cron_recent", "Recent cron", "cron", 1700000050.0), + ("cron_old", "Old cron", "cron", 1700000000.0), + ] + messages = [ + ("cron_recent", 1700000051.0, "assistant"), + ("cron_old", 1700000001.0, "assistant"), + ] + _make_state_db(db_path, sessions_data, messages=messages) + + sessions = models.get_cli_sessions() + + ids = [s["session_id"] for s in sessions] + assert ids.count("cron_recent") == 1, "cron_recent should appear exactly once" + assert ids.count("cron_old") == 1, "cron_old should appear exactly once" + + +def test_cron_session_with_no_messages_excluded_from_second_pass(fake_hermes_home, monkeypatch): + """The second pass should only pick up cron sessions that have messages; + empty cron runs should not appear.""" + monkeypatch.setattr(models, "CLI_VISIBLE_SESSION_LIMIT", 5) + monkeypatch.setattr(models, "CRON_PROJECT_CHIP_LIMIT", 200) + + db_path = fake_hermes_home / "state.db" + + non_cron = [ + (f"cli-{i:02d}", f"Session {i}", "cli", 1700000100.0 + i) + for i in range(10) + ] + # Cron session with no messages. + cron_empty = [("cron_empty_1", "Empty cron", "cron", 1700000000.0)] + # Cron session with messages. + cron_ok = [("cron_ok_1", "Active cron", "cron", 1700000001.0)] + + _make_state_db( + db_path, + non_cron + cron_empty + cron_ok, + messages=[("cron_ok_1", 1700000002.0, "assistant")], + ) + + sessions = models.get_cli_sessions() + cron_ids = [s["session_id"] for s in sessions if s.get("source_tag") == "cron"] + + assert "cron_ok_1" in cron_ids, "Messageful cron session should be included" + # Empty cron should be excluded by the rescue logic (message_count=0), + # but it may still appear in the raw list if the second pass picks it up. + # The rescue layer (_include_project_hidden_background_sidebar_sessions) + # will filter it out at the API level. From 9932899b884f60904993faf232feab3b43e029d9 Mon Sep 17 00:00:00 2001 From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com> Date: Sat, 30 May 2026 18:13:46 +0200 Subject: [PATCH 292/349] fix: guard session cache ownership across compression --- CHANGELOG.md | 4 + api/models.py | 16 +++ api/streaming.py | 92 ++++++++++++-- tests/test_issue765_streaming_persistence.py | 11 +- tests/test_session_cache_ownership.py | 122 +++++++++++++++++++ 5 files changed, 232 insertions(+), 13 deletions(-) create mode 100644 tests/test_session_cache_ownership.py diff --git a/CHANGELOG.md b/CHANGELOG.md index c8ec946546..580675afc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ ## [Unreleased] +### Fixed + +- Guard session and agent caches against compression/continuation id drift so a stale cached object cannot make `/api/session?session_id=` return an older transcript segment. + ## [v0.51.171] — 2026-05-30 — Release EQ (stage-batch53 — tool-output card badge + Neon opt-in skin) ### Added diff --git a/api/models.py b/api/models.py index aa80bfcfb9..0203c5ba01 100644 --- a/api/models.py +++ b/api/models.py @@ -2199,6 +2199,22 @@ def get_session(sid, metadata_only=False): cached = SESSIONS.get(sid) if cached is not None: SESSIONS.move_to_end(sid) # LRU: mark as recently used + if cached is not None: + # Defensive cache ownership check: compression/continuation and recovery + # paths can temporarily juggle Session objects across lineage ids. A + # stale object stored under the wrong key makes GET /api/session return + # a different transcript than the requested sid, which looks exactly + # like a disappeared session. Evict instead of trusting the LRU. + if str(getattr(cached, 'session_id', '') or '') != str(sid): + logger.warning( + "evicting mismatched cached session: requested %s but cached object is %s", + sid, + getattr(cached, 'session_id', None), + ) + with LOCK: + if SESSIONS.get(sid) is cached: + SESSIONS.pop(sid, None) + cached = None if cached is not None: if not metadata_only and _inactive_cache_tail_needs_disk_check(cached): try: diff --git a/api/streaming.py b/api/streaming.py index da77fef025..daf9a062fa 100644 --- a/api/streaming.py +++ b/api/streaming.py @@ -28,7 +28,7 @@ STREAM_REASONING_TEXT, STREAM_LIVE_TOOL_CALLS, STREAM_GOAL_RELATED, PENDING_GOAL_CONTINUATION, STREAM_LAST_EVENT_ID, - LOCK, SESSIONS, SESSION_DIR, + LOCK, SESSIONS, SESSIONS_MAX, SESSION_DIR, _get_session_agent_lock, _set_thread_env, _clear_thread_env, register_active_run, update_active_run, unregister_active_run, SESSION_AGENT_LOCKS, SESSION_AGENT_LOCKS_LOCK, @@ -2163,7 +2163,9 @@ def _run_background_title_update(session_id: str, user_text: str, assistant_text if next_title: with _get_session_agent_lock(session_id): with LOCK: - s = SESSIONS.get(session_id, s) + cached_session = SESSIONS.get(session_id) + if cached_session is not None and getattr(cached_session, 'session_id', None) == session_id: + s = cached_session effective_title = str(s.title or '').strip() invalid_existing_now = _looks_invalid_generated_title(s.title) still_auto = ( @@ -2238,7 +2240,9 @@ def _run_background_title_refresh(session_id: str, user_text: str, assistant_tex return with _get_session_agent_lock(session_id): with LOCK: - s = SESSIONS.get(session_id, s) + cached_session = SESSIONS.get(session_id) + if cached_session is not None and getattr(cached_session, 'session_id', None) == session_id: + s = cached_session # Re-check: user may have renamed while we were generating if str(s.title or '').strip() != current_title: _put_title_status(put_event, session_id, 'skipped', 'manual_title', str(s.title or '').strip()) @@ -3685,6 +3689,33 @@ def _refresh_cached_agent_runtime(agent, agent_kwargs: dict) -> bool: return False +def _cached_agent_session_identity(agent) -> str | None: + """Best-effort session id carried by a cached AIAgent. + + The cache key is only safe when it agrees with the object's own session + identity. Some old/fake agents may not expose an identity; keep those + backwards-compatible and treat them as unverifiable rather than mismatched. + """ + if agent is None: + return None + for attr in ('session_id', '_session_id'): + value = getattr(agent, attr, None) + if isinstance(value, str) and value: + return value + session_db = getattr(agent, '_session_db', None) + if session_db is not None: + for attr in ('session_id', '_session_id'): + value = getattr(session_db, attr, None) + if isinstance(value, str) and value: + return value + return None + + +def _cached_agent_matches_session(agent, session_id: str) -> bool: + identity = _cached_agent_session_identity(agent) + return identity is None or identity == str(session_id) + + def _refresh_cached_agent_primary_runtime_snapshot(agent) -> None: """Keep AIAgent's primary-runtime snapshot aligned with refreshed creds. @@ -4792,9 +4823,19 @@ def _fallback_entries(_raw): with SESSION_AGENT_CACHE_LOCK: _cached = SESSION_AGENT_CACHE.get(session_id) if _cached and _cached[1] == _agent_sig: - agent = _cached[0] - SESSION_AGENT_CACHE.move_to_end(session_id) # LRU: mark as recently used - logger.debug('[webui] Reusing cached agent for session %s', session_id) + _cached_agent = _cached[0] + if _cached_agent_matches_session(_cached_agent, session_id): + agent = _cached_agent + SESSION_AGENT_CACHE.move_to_end(session_id) # LRU: mark as recently used + logger.debug('[webui] Reusing cached agent for session %s', session_id) + else: + SESSION_AGENT_CACHE.pop(session_id, None) + logger.warning( + '[webui] Evicted cached agent with mismatched session identity: cache_key=%s agent_session_id=%s', + session_id, + _cached_agent_session_identity(_cached_agent), + ) + if agent is not None: # Reopened/cache-hit sessions must register the agent # so later lifecycle commits can find it. try: @@ -5448,8 +5489,22 @@ def _periodic_checkpoint(): # parent, losing access to the recoverable history in old_sid.json. s.parent_session_id = old_sid with LOCK: - if old_sid in SESSIONS: - SESSIONS[new_sid] = SESSIONS.pop(old_sid) + cached_old_session = SESSIONS.pop(old_sid, None) + if cached_old_session is not None and cached_old_session is not s: + cached_old_sid = str(getattr(cached_old_session, 'session_id', '') or '') + if cached_old_sid == str(old_sid): + SESSIONS[old_sid] = cached_old_session + else: + logger.warning( + "compression cache migration skipped stale object: old_sid=%s new_sid=%s cached_session_id=%s", + old_sid, + new_sid, + cached_old_sid or None, + ) + SESSIONS[new_sid] = s + SESSIONS.move_to_end(new_sid) + while len(SESSIONS) > SESSIONS_MAX: + SESSIONS.popitem(last=False) # Migrate the per-session lock: alias new_sid to the held # _agent_lock reference directly (not via old_sid lookup), # then remove the old_sid entry to prevent a leak. @@ -5462,7 +5517,16 @@ def _periodic_checkpoint(): with SESSION_AGENT_CACHE_LOCK: _cached_entry = SESSION_AGENT_CACHE.pop(old_sid, None) if _cached_entry: - SESSION_AGENT_CACHE[new_sid] = _cached_entry + _cached_agent = _cached_entry[0] + if _cached_agent_matches_session(_cached_agent, new_sid): + SESSION_AGENT_CACHE[new_sid] = _cached_entry + else: + logger.warning( + '[webui] Skipped cached agent migration with mismatched session identity: old_sid=%s new_sid=%s agent_session_id=%s', + old_sid, + new_sid, + _cached_agent_session_identity(_cached_agent), + ) _compressed = True # Also detect compression via the result dict or compressor state if not _compressed: @@ -6338,6 +6402,16 @@ def _handle_chat_steer(handler, body: dict) -> bool: with _cfg.SESSION_AGENT_CACHE_LOCK: cached = _cfg.SESSION_AGENT_CACHE.get(sid) + if cached: + agent = cached[0] + if not _cached_agent_matches_session(agent, sid): + _cfg.SESSION_AGENT_CACHE.pop(sid, None) + logger.warning( + '[webui] Evicted cached agent before steer due to mismatched session identity: cache_key=%s agent_session_id=%s', + sid, + _cached_agent_session_identity(agent), + ) + cached = None if not cached: # No active agent for this session — caller falls back to interrupt return j(handler, {"accepted": False, "fallback": "no_cached_agent", diff --git a/tests/test_issue765_streaming_persistence.py b/tests/test_issue765_streaming_persistence.py index 53a9d34a7d..7a74bf784d 100644 --- a/tests/test_issue765_streaming_persistence.py +++ b/tests/test_issue765_streaming_persistence.py @@ -465,14 +465,17 @@ def test_background_title_update_rebinds_to_canonical_session_instance(self): ) fn_idx = src.find("def _run_background_title_update(") assert fn_idx != -1, "_run_background_title_update not found" - fn_block = src[fn_idx:fn_idx + 3200] + fn_block = src[fn_idx:fn_idx + 4200] assert "with LOCK:" in fn_block, ( "_run_background_title_update must acquire LOCK before rebinding " "to canonical cached session instance" ) - assert "s = SESSIONS.get(session_id, s)" in fn_block, ( - "_run_background_title_update must rebind to canonical cached " - "session instance under LOCK" + assert "cached_session = SESSIONS.get(session_id)" in fn_block, ( + "_run_background_title_update must read the cached session under LOCK" + ) + assert "getattr(cached_session, 'session_id', None) == session_id" in fn_block, ( + "_run_background_title_update must only rebind to a canonical cached " + "session instance whose id matches the requested session" ) def test_cancel_stream_uses_agent_lock(self): diff --git a/tests/test_session_cache_ownership.py b/tests/test_session_cache_ownership.py new file mode 100644 index 0000000000..3e3ee33679 --- /dev/null +++ b/tests/test_session_cache_ownership.py @@ -0,0 +1,122 @@ +import json +from io import BytesIO +from types import SimpleNamespace + +import api.config as config +import api.models as models +from api.models import Session, get_session + + +def test_get_session_evicts_cached_object_with_wrong_session_id(tmp_path, monkeypatch): + session_dir = tmp_path / "sessions" + session_dir.mkdir() + monkeypatch.setattr(models, "SESSION_DIR", session_dir) + monkeypatch.setattr(models, "SESSION_INDEX_FILE", session_dir / "_index.json") + monkeypatch.setattr(config, "SESSION_INDEX_FILE", session_dir / "_index.json", raising=False) + models.SESSIONS.clear() + + requested = Session( + session_id="requested-tip", + title="Requested Tip", + messages=[{"role": "user", "content": "correct transcript"}], + ) + requested.save() + wrong = Session( + session_id="older-segment", + title="Older Segment", + messages=[{"role": "user", "content": "wrong transcript"}], + ) + + models.SESSIONS["requested-tip"] = wrong + + loaded = get_session("requested-tip") + + assert loaded.session_id == "requested-tip" + assert loaded.title == "Requested Tip" + assert loaded.messages == [{"role": "user", "content": "correct transcript"}] + assert models.SESSIONS["requested-tip"] is loaded + + models.SESSIONS.clear() + + +def test_get_session_metadata_only_evicts_cached_object_with_wrong_session_id(tmp_path, monkeypatch): + session_dir = tmp_path / "sessions" + session_dir.mkdir() + monkeypatch.setattr(models, "SESSION_DIR", session_dir) + monkeypatch.setattr(models, "SESSION_INDEX_FILE", session_dir / "_index.json") + monkeypatch.setattr(config, "SESSION_INDEX_FILE", session_dir / "_index.json", raising=False) + models.SESSIONS.clear() + + requested = Session( + session_id="requested-tip", + title="Requested Tip", + messages=[{"role": "user", "content": "correct transcript"}], + ) + requested.save() + models.SESSIONS["requested-tip"] = Session(session_id="older-segment", title="Older Segment") + + loaded = get_session("requested-tip", metadata_only=True) + + assert loaded.session_id == "requested-tip" + assert loaded.title == "Requested Tip" + assert models.SESSIONS.get("requested-tip") is None + + models.SESSIONS.clear() + + +def test_compression_cache_migration_never_moves_unverified_cached_object_to_new_sid(): + streaming_src = open("api/streaming.py", encoding="utf-8").read() + + assert "SESSIONS[new_sid] = SESSIONS.pop(old_sid)" not in streaming_src + assert "cached_old_session is not s" in streaming_src + assert "SESSIONS[new_sid] = s" in streaming_src + + +def test_cached_agent_session_identity_matches_requested_sid(): + from api.streaming import _cached_agent_matches_session, _cached_agent_session_identity + + matching = SimpleNamespace(session_id="requested") + mismatched = SimpleNamespace(session_id="other") + legacy = SimpleNamespace() + db_owned = SimpleNamespace(_session_db=SimpleNamespace(session_id="requested")) + + assert _cached_agent_session_identity(matching) == "requested" + assert _cached_agent_matches_session(matching, "requested") is True + assert _cached_agent_matches_session(mismatched, "requested") is False + assert _cached_agent_matches_session(db_owned, "requested") is True + assert _cached_agent_matches_session(legacy, "requested") is True + + +def test_handle_chat_steer_evicts_mismatched_cached_agent(): + from api.streaming import _handle_chat_steer + + class Handler: + headers = {} + + def __init__(self): + self.status = None + self.response_headers = [] + self.wfile = BytesIO() + + def send_response(self, status): + self.status = status + + def send_header(self, key, value): + self.response_headers.append((key, value)) + + def end_headers(self): + pass + + wrong_agent = SimpleNamespace(session_id="other-session", steer=lambda _text: True) + config.SESSION_AGENT_CACHE.clear() + config.SESSION_AGENT_CACHE["requested"] = (wrong_agent, "sig") + handler = Handler() + + _handle_chat_steer(handler, {"session_id": "requested", "text": "please steer"}) + + payload = json.loads(handler.wfile.getvalue().decode("utf-8")) + assert handler.status == 200 + assert payload == {"accepted": False, "fallback": "no_cached_agent", "stream_id": None} + assert "requested" not in config.SESSION_AGENT_CACHE + + config.SESSION_AGENT_CACHE.clear() From 9458df6f4d8d958bb579a96428a1461ffc800a71 Mon Sep 17 00:00:00 2001 From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com> Date: Sat, 30 May 2026 18:13:47 +0200 Subject: [PATCH 293/349] fix: dedupe sidebar completion session ids --- CHANGELOG.md | 4 ++ static/sessions.js | 9 +++- ...t_issue856_background_completion_unread.py | 4 +- tests/test_sidebar_completion_dedupe.py | 51 +++++++++++++++++++ 4 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 tests/test_sidebar_completion_dedupe.py diff --git a/CHANGELOG.md b/CHANGELOG.md index c8ec946546..c8272042a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ ## [Unreleased] +### Fixed + +- Avoid duplicate sidebar rows when a compressed session completes after both the preserved snapshot id and continuation id are already present in the session list. + ## [v0.51.171] — 2026-05-30 — Release EQ (stage-batch53 — tool-output card badge + Neon opt-in skin) ### Added diff --git a/static/sessions.js b/static/sessions.js index 0c89c1dabe..bc5af5170f 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -361,7 +361,9 @@ function _markSessionCompletedInList(session, previousSid = null) { if (!session || !Array.isArray(_allSessions)) return; const finalSid = session.session_id || previousSid; if (!finalSid) return; - const idx = _allSessions.findIndex(s => s && (s.session_id === finalSid || s.session_id === previousSid)); + const finalIdx = _allSessions.findIndex(s => s && s.session_id === finalSid); + const previousIdx = previousSid ? _allSessions.findIndex(s => s && s.session_id === previousSid) : -1; + const idx = finalIdx >= 0 ? finalIdx : previousIdx; if (idx < 0) return; const {messages: _messages, tool_calls: _toolCalls, ...sessionMeta} = session; const messageCount = Number( @@ -384,6 +386,11 @@ function _markSessionCompletedInList(session, previousSid = null) { _sessionStreamingById.set(finalSid, false); _forgetObservedStreamingSession(finalSid); if (previousSid && previousSid !== finalSid) { + for (let i = _allSessions.length - 1; i >= 0; i--) { + if (i !== idx && _allSessions[i] && _allSessions[i].session_id === previousSid) { + _allSessions.splice(i, 1); + } + } _sessionStreamingById.delete(previousSid); _forgetObservedStreamingSession(previousSid); _sessionListSnapshotById.delete(previousSid); diff --git a/tests/test_issue856_background_completion_unread.py b/tests/test_issue856_background_completion_unread.py index 2a62e9359f..2f885a8833 100644 --- a/tests/test_issue856_background_completion_unread.py +++ b/tests/test_issue856_background_completion_unread.py @@ -100,7 +100,9 @@ def test_sidebar_cache_completion_handles_compression_session_rotation(): assert "function _markSessionCompletedInList(session, previousSid = null)" in helper_block assert "const finalSid = session.session_id || previousSid;" in helper_block - assert "s.session_id === finalSid || s.session_id === previousSid" in helper_block + assert "const finalIdx = _allSessions.findIndex(s => s && s.session_id === finalSid);" in helper_block + assert "const previousIdx = previousSid ? _allSessions.findIndex(s => s && s.session_id === previousSid) : -1;" in helper_block + assert "const idx = finalIdx >= 0 ? finalIdx : previousIdx;" in helper_block assert "const {messages: _messages, tool_calls: _toolCalls, ...sessionMeta} = session;" in helper_block assert "...sessionMeta" in helper_block assert "session_id: finalSid" in helper_block diff --git a/tests/test_sidebar_completion_dedupe.py b/tests/test_sidebar_completion_dedupe.py new file mode 100644 index 0000000000..82d26c44e0 --- /dev/null +++ b/tests/test_sidebar_completion_dedupe.py @@ -0,0 +1,51 @@ +import json +import subprocess +from pathlib import Path + + +REPO_ROOT = Path(__file__).resolve().parents[1] + + +def _extract_js_function(src: str, name: str) -> str: + start = src.index(f"function {name}(") + brace = src.index("{", start) + depth = 0 + for idx in range(brace, len(src)): + ch = src[idx] + if ch == "{": + depth += 1 + elif ch == "}": + depth -= 1 + if depth == 0: + return src[start : idx + 1] + raise AssertionError(f"could not extract {name}") + + +def test_mark_session_completed_in_list_dedupes_old_and_new_sid_rows(): + sessions_src = (REPO_ROOT / "static" / "sessions.js").read_text(encoding="utf-8") + fn_src = _extract_js_function(sessions_src, "_markSessionCompletedInList") + script = f""" +let _allSessions = [ + {{ session_id: 'old', title: 'Before', message_count: 10, pre_compression_snapshot: true }}, + {{ session_id: 'new', title: 'After', message_count: 2, parent_session_id: 'old' }}, +]; +let _sessionStreamingById = new Map([['old', true], ['new', true]]); +let _sessionListSnapshotById = new Map([['old', {{message_count: 10}}]]); +function _forgetObservedStreamingSession(_sid) {{}} +function renderSessionListFromCache() {{}} +{fn_src} +_markSessionCompletedInList({{ + session_id: 'new', + title: 'After done', + message_count: 3, + parent_session_id: 'old', +}}, 'old'); +console.log(JSON.stringify({{rows: _allSessions, oldStreaming: _sessionStreamingById.has('old')}})); +""" + result = subprocess.run(["node", "-e", script], check=True, text=True, capture_output=True) + payload = json.loads(result.stdout) + + assert [row["session_id"] for row in payload["rows"]] == ["new"] + assert payload["rows"][0]["title"] == "After done" + assert payload["rows"][0]["message_count"] == 3 + assert payload["oldStreaming"] is False From cb193a97684e1e5c6017a4f57c07fa20c45eecdf Mon Sep 17 00:00:00 2001 From: nesquena-hermes <[email protected]> Date: Sat, 30 May 2026 18:11:02 +0000 Subject: [PATCH 294/349] docs(changelog): v0.51.172 release header (stage-batch54) --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 091442ccb2..60c7e1c9cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,14 @@ ## [Unreleased] +## [v0.51.172] — 2026-05-30 — Release ER (stage-batch54 — model-label fallback + dev cache-bust hash + tilde workspace completion + cron project-chip sessions) + ### Fixed +- Session model labels now fall back to the friendly `getModelLabel()` form instead of the raw model id when gateway routing info is unavailable (#3174). - Dev-build cache-busting now includes a short hash of the tracked dirty diff, so local asset URLs change on each edit instead of staying at a constant `-dirty` suffix (#3159). - Workspace path autocomplete now preserves `~/` suggestions while browsing under the user's home directory (#3173). +- CLI-sourced cron sessions that were squeezed past the default sidebar window now stay addressable under their project chip via a dedicated cron-only lookup pass (#3172). ## [v0.51.171] — 2026-05-30 — Release EQ (stage-batch53 — tool-output card badge + Neon opt-in skin) From 76d052875d09e1aefb655f4d83c69cda42e939b5 Mon Sep 17 00:00:00 2001 From: nesquena-hermes <[email protected]> Date: Sat, 30 May 2026 18:46:41 +0000 Subject: [PATCH 295/349] docs(changelog): v0.51.173 release header (stage-batch55) --- CHANGELOG.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edb62b0fb6..dec520a03b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,28 +3,28 @@ ## [Unreleased] -## [v0.51.172] — 2026-05-30 — Release ER (stage-batch54 — model-label fallback + dev cache-bust hash + tilde workspace completion + cron project-chip sessions) +## [v0.51.173] — 2026-05-30 — Release ES (stage-batch55 — Windows path/journal safety + pin-quota snapshot fix + tool-card paging anchor + sidebar dedupe + quieter tool cards) ### Fixed -- Session model labels now fall back to the friendly `getModelLabel()` form instead of the raw model id when gateway routing info is unavailable (#3174). -- Dev-build cache-busting now includes a short hash of the tracked dirty diff, so local asset URLs change on each edit instead of staying at a constant `-dirty` suffix (#3159). -- Workspace path autocomplete now preserves `~/` suggestions while browsing under the user's home directory (#3173). -- CLI-sourced cron sessions that were squeezed past the default sidebar window now stay addressable under their project chip via a dedicated cron-only lookup pass (#3172). - - Windows native runs now skip the POSIX-only turn-journal directory fsync instead of raising `AttributeError` for missing `os.O_DIRECTORY` on every submitted turn (#3170). - `/api/media` now treats Windows cross-drive `commonpath()` comparisons as non-matches instead of 500ing when media paths and allowed roots live on different drives (#3171). - - Hidden pre-compression snapshots no longer keep stale pin state or count toward the visible pinned-session quota (#3181). - - Tool-call cards stay anchored when scrolling back through paginated history; legacy session-level tool-call indices are rebased to the returned message window and the browser refreshes tool-call anchors whenever a larger history window is loaded (#3120). - - Avoid duplicate sidebar rows when a compressed session completes after both the preserved snapshot id and continuation id are already present in the session list. ### Changed - Restored the legacy compact tool-call card chrome by removing the persistent "Tool output" badge and returning the left rail to the muted border treatment. This keeps tool activity visually quieter while preserving the existing collapsible tool details. +## [v0.51.172] — 2026-05-30 — Release ER (stage-batch54 — model-label fallback + dev cache-bust hash + tilde workspace completion + cron project-chip sessions) + +### Fixed + +- Session model labels now fall back to the friendly `getModelLabel()` form instead of the raw model id when gateway routing info is unavailable (#3174). +- Dev-build cache-busting now includes a short hash of the tracked dirty diff, so local asset URLs change on each edit instead of staying at a constant `-dirty` suffix (#3159). +- Workspace path autocomplete now preserves `~/` suggestions while browsing under the user's home directory (#3173). +- CLI-sourced cron sessions that were squeezed past the default sidebar window now stay addressable under their project chip via a dedicated cron-only lookup pass (#3172). ## [v0.51.171] — 2026-05-30 — Release EQ (stage-batch53 — tool-output card badge + Neon opt-in skin) From d6c1b696f55a677c2761996dd494ef7081bf9cb8 Mon Sep 17 00:00:00 2001 From: carryzuo00 Date: Sun, 31 May 2026 02:51:26 +0800 Subject: [PATCH 296/349] fix(reasoning): expose effort levels for bare/dot-separated model names on custom providers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Custom API aggregators (New API, One API, etc.) route requests using their own naming conventions — bare names like ``deepseek-v4-flash`` or dot-separated names like ``moonshotai.kimi-k2.5`` — rather than the OpenRouter-style ``vendor/model`` slash format that ``_heuristic_reasoning_efforts``'s prefix list was written for. Because none of these names match the slash-prefixed patterns, the function returned ``[]``, hiding the reasoning effort selector in the WebUI even for models that fully support thinking/reasoning. Fix: add a secondary check in ``_heuristic_reasoning_efforts`` that strips an optional dot-vendor prefix and matches the remaining model name against a list of known thinking-capable bare-name prefixes (``deepseek-v4``, ``deepseek-r1``, ``kimi-k2``, ``qwen3``, ``claude-3/4``, ``o1/o3/o4``), plus a keyword catch for model names containing ``thinking`` or ``reasoning``. The slash-prefix path and all provider-specific fast paths (copilot, lmstudio, models.dev metadata) are unchanged; this block only runs as a final fallback. Regression tests added in ``tests/test_custom_provider_bare_model_reasoning.py``. --- api/config.py | 26 +++++ ...st_custom_provider_bare_model_reasoning.py | 109 ++++++++++++++++++ 2 files changed, 135 insertions(+) create mode 100644 tests/test_custom_provider_bare_model_reasoning.py diff --git a/api/config.py b/api/config.py index 85c47dde45..8fa873b63f 100644 --- a/api/config.py +++ b/api/config.py @@ -2131,6 +2131,32 @@ def _heuristic_reasoning_efforts(model_id: str, provider_id: str) -> list[str]: ) if any(model.startswith(prefix) for prefix in prefixes): return list(VALID_REASONING_EFFORTS) + # Custom API aggregators (e.g. New API, One API) use non-standard model naming: + # bare names like "deepseek-v4-flash" or dot-separated "moonshotai.kimi-k2.5" + # rather than the OpenRouter-style "vendor/model" that the prefix list targets. + # Strip a dot-vendor prefix (e.g. "moonshotai.kimi-k2.5" → "kimi-k2.5") and + # check both the original bare name and the stripped suffix. + bare_after_dot = bare.split(".", 1)[-1] if "." in bare else bare + thinking_bare_prefixes = ( + "deepseek-v4", + "deepseek-r1", + "deepseek-r2", + "kimi-k2", + "kimi-thinking", + "qwen3", + "claude-3", + "claude-4", + "o1-", + "o3-", + "o4-", + ) + if any( + bare.startswith(p) or bare_after_dot.startswith(p) + for p in thinking_bare_prefixes + ): + return list(VALID_REASONING_EFFORTS) + if "thinking" in bare or "reasoning" in bare: + return list(VALID_REASONING_EFFORTS) return [] diff --git a/tests/test_custom_provider_bare_model_reasoning.py b/tests/test_custom_provider_bare_model_reasoning.py new file mode 100644 index 0000000000..951854fa27 --- /dev/null +++ b/tests/test_custom_provider_bare_model_reasoning.py @@ -0,0 +1,109 @@ +"""Regression tests: custom providers with non-slash model names expose reasoning efforts. + +Custom API aggregators (e.g. New API, One API) route requests using their own +naming conventions — bare names like ``deepseek-v4-flash`` or dot-separated +names like ``moonshotai.kimi-k2.5`` — rather than the OpenRouter-style +``vendor/model`` slash format that the heuristic prefix list was written for. + +Before this fix, ``resolve_model_reasoning_efforts`` always returned ``[]`` for +these combinations, hiding the reasoning effort selector in the UI even though +the underlying models fully support thinking/reasoning. +""" + +import api.config as cfg + + +# ── bare model names (no slash or dot prefix) ──────────────────────────────── + +def test_deepseek_v4_flash_bare_name_custom_provider(): + efforts = cfg.resolve_model_reasoning_efforts( + "deepseek-v4-flash", + provider_id="custom:newapi", + ) + assert set(efforts) >= {"low", "medium", "high"}, ( + "deepseek-v4-flash via custom provider should expose reasoning efforts" + ) + + +def test_deepseek_r1_bare_name_custom_provider(): + efforts = cfg.resolve_model_reasoning_efforts( + "deepseek-r1", + provider_id="custom:newapi", + ) + assert set(efforts) >= {"low", "medium", "high"} + + +# ── dot-separated model names (vendor.model) ───────────────────────────────── + +def test_kimi_dot_separated_custom_provider(): + efforts = cfg.resolve_model_reasoning_efforts( + "moonshotai.kimi-k2.5", + provider_id="custom:newapi", + ) + assert set(efforts) >= {"low", "medium", "high"}, ( + "moonshotai.kimi-k2.5 via custom provider should expose reasoning efforts" + ) + + +def test_qwen3_dot_separated_custom_provider(): + efforts = cfg.resolve_model_reasoning_efforts( + "qwen.qwen3-vl-235b-a22b-instruct", + provider_id="custom:newapi", + ) + assert set(efforts) >= {"low", "medium", "high"} + + +# ── "thinking" keyword in model name ───────────────────────────────────────── + +def test_thinking_keyword_in_model_name_custom_provider(): + efforts = cfg.resolve_model_reasoning_efforts( + "vendor.some-model-thinking-preview", + provider_id="custom:newapi", + ) + assert set(efforts) >= {"low", "medium", "high"}, ( + "model name containing 'thinking' should always expose reasoning efforts" + ) + + +def test_reasoning_keyword_in_model_name_custom_provider(): + efforts = cfg.resolve_model_reasoning_efforts( + "vendor.model-reasoning-v1", + provider_id="custom:newapi", + ) + assert set(efforts) >= {"low", "medium", "high"} + + +# ── non-reasoning models must stay hidden ───────────────────────────────────── + +def test_plain_llm_bare_name_custom_provider_no_reasoning(): + assert cfg.resolve_model_reasoning_efforts( + "llama-3.1-8b-instruct", + provider_id="custom:newapi", + ) == [], ( + "generic llama model via custom provider should NOT expose reasoning efforts" + ) + + +def test_plain_llm_dot_separated_custom_provider_no_reasoning(): + assert cfg.resolve_model_reasoning_efforts( + "meta.llama-3.1-70b", + provider_id="custom:newapi", + ) == [] + + +# ── slash-prefixed names must still work (no regression) ───────────────────── + +def test_deepseek_slash_prefix_still_works(): + efforts = cfg.resolve_model_reasoning_efforts( + "deepseek/deepseek-v4-flash", + provider_id="custom:newapi", + ) + assert set(efforts) >= {"low", "medium", "high"} + + +def test_openrouter_slash_prefix_unaffected(): + efforts = cfg.resolve_model_reasoning_efforts( + "anthropic/claude-sonnet-4.5", + provider_id="openrouter", + ) + assert set(efforts) >= {"low", "medium", "high"} From 1048d2cb0cbf3800d8e2ad46aacd71bdb5c0862b Mon Sep 17 00:00:00 2001 From: wind-chant Date: Sat, 30 May 2026 23:13:00 +0800 Subject: [PATCH 297/349] feat: include CLI session usage in WebUI Insights The Insights page () previously only counted WebUI-native sessions from its own session index. This adds a query to the Hermes state.db so CLI and gateway sessions (Telegram, Discord, etc.) are also included in the aggregated token counts, costs, model breakdown, and daily activity charts. The state.db query is best-effort: if the file is missing or unreadable, the existing WebUI-only data is returned as before. --- api/routes.py | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/api/routes.py b/api/routes.py index 90ca74c27f..94aae9c211 100644 --- a/api/routes.py +++ b/api/routes.py @@ -3539,6 +3539,62 @@ def _session_usage_ts(session: dict) -> float: except Exception: pass + # ── Also include CLI sessions from Hermes state.db ───────────────────── + try: + from api.models import _active_state_db_path + db_path = _active_state_db_path() + if db_path and db_path.exists(): + with closing(sqlite3.connect(str(db_path))) as conn: + conn.row_factory = sqlite3.Row + cur = conn.cursor() + cur.execute(""" + SELECT id, model, message_count, input_tokens, output_tokens, + estimated_cost_usd, started_at, ended_at + FROM sessions + WHERE (started_at >= ? OR ended_at >= ?) + """, (cutoff, cutoff)) + for row in cur.fetchall(): + _input = _safe_usage_int(row["input_tokens"]) + _output = _safe_usage_int(row["output_tokens"]) + _cost = _safe_cost_float(row["estimated_cost_usd"]) + _msgs = _safe_usage_int(row["message_count"]) + total_sessions += 1 + total_messages += _msgs + total_input_tokens += _input + total_output_tokens += _output + total_cost += _cost + + _model = row["model"] or "unknown" + bucket = model_stats.setdefault(_model, { + "sessions": 0, + "input_tokens": 0, + "output_tokens": 0, + "cost": 0.0, + }) + bucket["sessions"] += 1 + bucket["input_tokens"] += _input + bucket["output_tokens"] += _output + bucket["cost"] += _cost + + _ts = row["started_at"] or row["ended_at"] or 0 + if _ts: + _dt = _time.localtime(_ts) + _day_key = _time.strftime("%Y-%m-%d", _dt) + _daily = daily_tokens.setdefault(_day_key, { + "input_tokens": 0, + "output_tokens": 0, + "sessions": 0, + "cost": 0.0, + }) + _daily["input_tokens"] += _input + _daily["output_tokens"] += _output + _daily["sessions"] += 1 + _daily["cost"] += _cost + dow_activity[_dt.tm_wday] += 1 + hod_activity[_dt.tm_hour] += 1 + except Exception: + logger.debug("Failed to include CLI sessions in insights", exc_info=True) + # Build model breakdown total_tokens = total_input_tokens + total_output_tokens models_breakdown = [] From c26e25414e038b3fe7b2a7d342e4339a90c7071f Mon Sep 17 00:00:00 2001 From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com> Date: Sat, 30 May 2026 20:56:59 +0200 Subject: [PATCH 298/349] fix: clarify sidebar session tooltips --- CHANGELOG.md | 4 ++++ static/sessions.js | 39 ++++++++++++++++++++++++++++++---- tests/test_sidebar_tooltips.py | 34 +++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 tests/test_sidebar_tooltips.py diff --git a/CHANGELOG.md b/CHANGELOG.md index dec520a03b..f6976a2d9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ ## [Unreleased] +### Fixed + +- Sidebar session row tooltips now explain fork, prior-turn, child-session, and status badges, and hovering the truncated chat title now shows the full title instead of the old rename hint. + ## [v0.51.173] — 2026-05-30 — Release ES (stage-batch55 — Windows path/journal safety + pin-quota snapshot fix + tool-card paging anchor + sidebar dedupe + quieter tool cards) ### Fixed diff --git a/static/sessions.js b/static/sessions.js index ba4e203fe5..035cb6191b 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -3145,6 +3145,36 @@ function _sessionTitleForForkParent(parentSid){ return title; } +function _sessionFullTitleTooltip(rawTitle, cleanTitle){ + const fallback=String(cleanTitle||'Untitled').trim()||'Untitled'; + const full=String(rawTitle||fallback).trim()||fallback; + if(full.startsWith('[SYSTEM:')) return fallback; + return full; +} + +function _sessionForkTooltip(parentLabel){ + const parent=String(parentLabel||'').trim()||'unknown parent'; + return `Forked conversation — parent: ${parent}`; +} + +function _sessionLineageBadgeTooltip(label, canExpand){ + const base=String(label||'Prior turns').trim()||'Prior turns'; + return canExpand + ? `${base} — earlier context turns are collapsed here. Click to show or hide them.` + : `${base} — earlier context turns are collapsed here.`; +} + +function _sessionChildBadgeTooltip(label){ + const base=String(label||'Child sessions').trim()||'Child sessions'; + return `${base} — child conversations spawned from this session. Click to show or hide them.`; +} + +function _sessionStateTooltip({isStreaming=false,hasUnread=false}={}){ + if(isStreaming) return 'Conversation is running'; + if(hasUnread) return 'Unread completion'; + return ''; +} + function _attachChildSessionsToSidebarRows(collapsedRows, rawSessions){ const rows=(collapsedRows||[]).filter(s=>!_isChildSession(s)).map(s=>({...s})); const visibleBySid=new Map(); @@ -3843,7 +3873,7 @@ function renderSessionListFromCache(){ branchInd.className='session-branch-indicator'; branchInd.innerHTML=li('git-branch',12); const parentLabel=_sessionTitleForForkParent(s.parent_session_id)||_truncatedSessionId(s.parent_session_id); - branchInd.title=(typeof t==='function'?t('forked_from'):'Forked from')+' '+parentLabel; + branchInd.title=_sessionForkTooltip(parentLabel); titleRow.appendChild(branchInd); } const title=document.createElement('span'); @@ -3852,7 +3882,7 @@ function renderSessionListFromCache(){ const titleMatched=Boolean(searchQueryRaw&&displayTitle.toLowerCase().includes(searchQueryRaw.toLowerCase())); if(titleMatched) _appendHighlightedText(title,displayTitle,searchQueryRaw,'session-search-hit'); else title.textContent=displayTitle; - title.title=readOnly?'Read-only imported session':'Double-click to rename'; + title.title=_sessionFullTitleTooltip(rawTitle,cleanTitle); const tsMs=_sessionTimestampMs(s); const ts=document.createElement('span'); const hasAttentionState=isStreaming||hasUnread; @@ -3888,7 +3918,7 @@ function renderSessionListFromCache(){ segmentCountEl.className='session-lineage-count'+(canExpandLineageSegments?' expandable':''); const segmentLabel=t('session_meta_segments', segmentCount); segmentCountEl.textContent=segmentLabel; - segmentCountEl.title=segmentLabel; + segmentCountEl.title=_sessionLineageBadgeTooltip(segmentLabel,canExpandLineageSegments); if(canExpandLineageSegments){ segmentCountEl.setAttribute('role','button'); segmentCountEl.setAttribute('tabindex','0'); @@ -3917,7 +3947,7 @@ function renderSessionListFromCache(){ childCountEl.className='session-child-count'; const childLabel=t('session_meta_children', childCount); childCountEl.textContent=childLabel; - childCountEl.title=childLabel; + childCountEl.title=_sessionChildBadgeTooltip(childLabel); ['pointerdown','pointerup','click'].forEach(ev=>childCountEl.addEventListener(ev,e=>e.stopPropagation())); childCountEl.onclick=(e)=>{ e.stopPropagation(); @@ -4104,6 +4134,7 @@ function renderSessionListFromCache(){ const state=document.createElement('span'); state.className='session-attention-indicator session-state-indicator'+(isStreaming?' is-streaming':(hasUnread?' is-unread':'')); state.setAttribute('aria-hidden','true'); + state.title=_sessionStateTooltip({isStreaming,hasUnread}); el.appendChild(state); // Single trigger button that opens a shared dropdown menu let actions=null; diff --git a/tests/test_sidebar_tooltips.py b/tests/test_sidebar_tooltips.py new file mode 100644 index 0000000000..a5be58913c --- /dev/null +++ b/tests/test_sidebar_tooltips.py @@ -0,0 +1,34 @@ +"""Sidebar tooltip contract tests.""" +from pathlib import Path + +REPO_ROOT = Path(__file__).parent.parent.resolve() +SESSIONS_JS_PATH = REPO_ROOT / "static" / "sessions.js" + + +def _sessions_js() -> str: + return SESSIONS_JS_PATH.read_text(encoding="utf-8") + + +def test_session_title_hover_shows_full_title_not_rename_hint(): + """The truncated sidebar title needs a real full-title tooltip. + + The old "Double-click to rename" title hid the only native hover affordance + that can reveal a long chat title when badges/tags squeeze the row. + """ + js = _sessions_js() + assert "Double-click to rename" not in js + assert "title.title=_sessionFullTitleTooltip(rawTitle,cleanTitle);" in js + + +def test_sidebar_status_badges_have_explanatory_tooltips(): + """Compact badges/icons must explain what they mean, not repeat the chip text.""" + js = _sessions_js() + assert "function _sessionFullTitleTooltip" in js + assert "function _sessionForkTooltip" in js + assert "function _sessionLineageBadgeTooltip" in js + assert "function _sessionChildBadgeTooltip" in js + assert "function _sessionStateTooltip" in js + assert "branchInd.title=_sessionForkTooltip(parentLabel);" in js + assert "segmentCountEl.title=_sessionLineageBadgeTooltip(segmentLabel,canExpandLineageSegments);" in js + assert "childCountEl.title=_sessionChildBadgeTooltip(childLabel);" in js + assert "state.title=_sessionStateTooltip({isStreaming,hasUnread});" in js From 06842f6e9f40b2c57264964780c8cebd6d523e57 Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Sat, 30 May 2026 18:58:20 +0000 Subject: [PATCH 299/349] fix(insights): exclude source='webui' from CLI session pass + add tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new CLI/gateway insights pass counted ALL state.db sessions, but WebUI-native sessions are persisted to state.db with source='webui' AND already counted from the sidecar _index.json first pass — double-counting them in totals, model breakdown, and daily charts. Add `AND COALESCE(source, '') != 'webui'` so only CLI/gateway/cron/tui rows are added by the second pass. Adds regression tests proving (a) CLI + Telegram sessions appear in totals and (b) a webui-source state.db row is not double-counted against its _index.json entry. Co-authored-by: wind-chant --- api/routes.py | 1 + tests/test_insights.py | 93 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/api/routes.py b/api/routes.py index 94aae9c211..4118a3a9cb 100644 --- a/api/routes.py +++ b/api/routes.py @@ -3552,6 +3552,7 @@ def _session_usage_ts(session: dict) -> float: estimated_cost_usd, started_at, ended_at FROM sessions WHERE (started_at >= ? OR ended_at >= ?) + AND COALESCE(source, '') != 'webui' """, (cutoff, cutoff)) for row in cur.fetchall(): _input = _safe_usage_int(row["input_tokens"]) diff --git a/tests/test_insights.py b/tests/test_insights.py index 913d043905..69921b9420 100644 --- a/tests/test_insights.py +++ b/tests/test_insights.py @@ -318,3 +318,96 @@ def test_insights_mobile_models_table_has_contained_overflow(): section_block = STYLE_CSS[section_start:section_end] assert 'overflow-x' in section_block, 'Mobile rule should include overflow-x handling' assert 'insights-model-table' in section_block or 'insights-card' in section_block + + +# ── #3189: CLI/gateway sessions in Insights + webui double-count guard ────── + + +def _call_insights_with_state_db(monkeypatch, tmp_path, entries, state_rows, days="7", now=None): + """Like _call_insights but also seeds an agent state.db with `sessions` rows + and points _active_state_db_path at it, so the CLI second-pass is exercised.""" + import sqlite3 + import api.routes as routes + import api.models as models + + session_dir = tmp_path / "sessions" + session_dir.mkdir() + (session_dir / "_index.json").write_text(json.dumps(entries), encoding="utf-8") + monkeypatch.setattr(routes, "SESSION_DIR", session_dir) + if now is not None: + monkeypatch.setattr(time, "time", lambda: now) + + db_path = tmp_path / "state.db" + conn = sqlite3.connect(str(db_path)) + conn.execute( + """CREATE TABLE sessions ( + id TEXT PRIMARY KEY, source TEXT, model TEXT, message_count INTEGER, + input_tokens INTEGER, output_tokens INTEGER, estimated_cost_usd REAL, + started_at REAL, ended_at REAL + )""" + ) + for r in state_rows: + conn.execute( + "INSERT INTO sessions (id, source, model, message_count, input_tokens, " + "output_tokens, estimated_cost_usd, started_at, ended_at) " + "VALUES (?,?,?,?,?,?,?,?,?)", + (r["id"], r.get("source"), r.get("model"), r.get("message_count", 0), + r.get("input_tokens", 0), r.get("output_tokens", 0), + r.get("estimated_cost_usd", 0.0), r.get("started_at"), r.get("ended_at")), + ) + conn.commit() + conn.close() + # _handle_insights does `from api.models import _active_state_db_path`, so patch on the module. + monkeypatch.setattr(models, "_active_state_db_path", lambda: db_path) + + handler = _FakeHandler() + parsed = SimpleNamespace(query=f"days={days}") + routes._handle_insights(handler, parsed) + assert handler.status == 200 + return handler.json_body() + + +def test_insights_includes_cli_and_gateway_sessions(monkeypatch, tmp_path): + """CLI / Telegram / Discord sessions in state.db should appear in Insights totals.""" + now = time.mktime((2026, 5, 30, 12, 0, 0, 0, 0, -1)) + webui_entries = [ + {"session_id": "w1", "updated_at": now, "created_at": now, "message_count": 2, + "input_tokens": 100, "output_tokens": 50, "estimated_cost": 0.01, "model": "gpt-5.5"}, + ] + state_rows = [ + {"id": "cli1", "source": "cli", "model": "gpt-5.5", "message_count": 3, + "input_tokens": 200, "output_tokens": 80, "estimated_cost_usd": 0.02, + "started_at": now, "ended_at": now}, + {"id": "tg1", "source": "telegram", "model": "gpt-5.5", "message_count": 1, + "input_tokens": 60, "output_tokens": 20, "estimated_cost_usd": 0.005, + "started_at": now, "ended_at": now}, + ] + data = _call_insights_with_state_db(monkeypatch, tmp_path, webui_entries, state_rows, days="7", now=now) + # 1 webui + 2 cli/gateway = 3 sessions counted + assert data["total_sessions"] == 3 + # input tokens summed across all three: 100 + 200 + 60 = 360 + assert data["total_input_tokens"] == 360 + + +def test_insights_does_not_double_count_webui_state_db_rows(monkeypatch, tmp_path): + """WebUI sessions persist to BOTH _index.json AND state.db (source='webui'). + The CLI second-pass must exclude source='webui' so they aren't counted twice.""" + now = time.mktime((2026, 5, 30, 12, 0, 0, 0, 0, -1)) + webui_entries = [ + {"session_id": "w1", "updated_at": now, "created_at": now, "message_count": 2, + "input_tokens": 100, "output_tokens": 50, "estimated_cost": 0.01, "model": "gpt-5.5"}, + ] + # The SAME webui session also has a state.db row (source='webui') + one real cli row. + state_rows = [ + {"id": "w1", "source": "webui", "model": "gpt-5.5", "message_count": 2, + "input_tokens": 100, "output_tokens": 50, "estimated_cost_usd": 0.01, + "started_at": now, "ended_at": now}, + {"id": "cli1", "source": "cli", "model": "gpt-5.5", "message_count": 3, + "input_tokens": 200, "output_tokens": 80, "estimated_cost_usd": 0.02, + "started_at": now, "ended_at": now}, + ] + data = _call_insights_with_state_db(monkeypatch, tmp_path, webui_entries, state_rows, days="7", now=now) + # webui session counted once (from _index.json), cli once = 2, NOT 3. + assert data["total_sessions"] == 2 + # webui tokens counted once (100) + cli (200) = 300, NOT 400. + assert data["total_input_tokens"] == 300 From 7ec16ba30c2d916a144f4251383864f5f935df74 Mon Sep 17 00:00:00 2001 From: nesquena-hermes <[email protected]> Date: Sat, 30 May 2026 19:08:08 +0000 Subject: [PATCH 300/349] docs(changelog): v0.51.174 release header (stage-batch56) --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dec520a03b..1bd8d97988 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ ## [Unreleased] +## [v0.51.174] — 2026-05-30 — Release ET (stage-batch56 — CLI/gateway session usage in Insights) + +### Added + +- The Insights page now includes CLI and gateway sessions (Telegram, Discord, cron, TUI) from the Hermes agent's `state.db` in usage totals, model breakdown, and daily activity — not just WebUI-native sessions (#3189). WebUI sessions are de-duplicated so they are counted once, not double-counted against their `state.db` row. + ## [v0.51.173] — 2026-05-30 — Release ES (stage-batch55 — Windows path/journal safety + pin-quota snapshot fix + tool-card paging anchor + sidebar dedupe + quieter tool cards) ### Fixed From d3ee17793ab953d31309e0179d261c03deac36b9 Mon Sep 17 00:00:00 2001 From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com> Date: Sat, 30 May 2026 10:48:42 +0200 Subject: [PATCH 301/349] feat: add internal conversation links --- static/i18n.js | 48 ++++++++++++++ static/messages.js | 20 +++++- static/sessions.js | 89 +++++++++++++++++++++++--- static/ui.js | 33 ++++++++-- tests/test_session_copy_link_action.py | 76 ++++++++++++++++++++++ 5 files changed, 249 insertions(+), 17 deletions(-) create mode 100644 tests/test_session_copy_link_action.py diff --git a/static/i18n.js b/static/i18n.js index c8d9fb45f3..99b036be8e 100644 --- a/static/i18n.js +++ b/static/i18n.js @@ -420,6 +420,10 @@ const LOCALES = { path_copy_failed: 'Failed to copy path: ', session_rename: 'Rename conversation', session_rename_desc: 'Edit the title of this conversation', + session_copy_link: 'Copy conversation link', + session_copy_link_desc: 'Copy a direct link to this conversation', + session_link_copied: 'Conversation link copied to clipboard', + session_link_copy_failed: 'Failed to copy conversation link: ', new_file_prompt: 'New file name (e.g. notes.md):', project_name_prompt: 'Project name:', created: 'Created ', @@ -1721,6 +1725,10 @@ const LOCALES = { path_copy_failed: 'Copia percorso fallita: ', session_rename: 'Rinomina conversazione', session_rename_desc: 'Modifica il titolo di questa conversazione', + session_copy_link: 'Copia link conversazione', + session_copy_link_desc: 'Copia un link diretto a questa conversazione', + session_link_copied: 'Link conversazione copiato negli appunti', + session_link_copy_failed: 'Impossibile copiare il link della conversazione: ', new_file_prompt: 'Nuovo nome file (es. note.md):', project_name_prompt: 'Nome progetto:', created: 'Creato ', @@ -3014,6 +3022,10 @@ const LOCALES = { path_copy_failed: 'パスのコピーに失敗しました: ', session_rename: '会話の名前を変更', session_rename_desc: 'この会話のタイトルを編集', + session_copy_link: '会話リンクをコピー', + session_copy_link_desc: 'この会話への直接リンクをコピー', + session_link_copied: '会話リンクをクリップボードにコピーしました', + session_link_copy_failed: '会話リンクをコピーできませんでした: ', new_file_prompt: '新しいファイル名 (例: notes.md):', project_name_prompt: 'プロジェクト名:', created: '作成しました: ', @@ -4232,6 +4244,10 @@ const LOCALES = { path_copy_failed: 'Не удалось скопировать путь: ', session_rename: 'Переименовать беседу', session_rename_desc: 'Изменить название этой беседы', + session_copy_link: 'Скопировать ссылку на беседу', + session_copy_link_desc: 'Скопировать прямую ссылку на эту беседу', + session_link_copied: 'Ссылка на беседу скопирована в буфер обмена', + session_link_copy_failed: 'Не удалось скопировать ссылку на беседу: ', new_file_prompt: 'Имя нового файла (например, notes.md):', project_name_prompt: 'Имя проекта:', created: 'Создано ', @@ -5443,6 +5459,10 @@ const LOCALES = { path_copy_failed: 'Error al copiar la ruta: ', session_rename: 'Renombrar conversación', session_rename_desc: 'Editar el título de esta conversación', + session_copy_link: 'Copiar enlace de conversación', + session_copy_link_desc: 'Copia un enlace directo a esta conversación', + session_link_copied: 'Enlace de conversación copiado al portapapeles', + session_link_copy_failed: 'No se pudo copiar el enlace de conversación: ', new_file_prompt: 'Nombre del archivo nuevo (p. ej. notes.md):', created: 'Creado ', create_failed: 'Error al crear: ', @@ -6657,6 +6677,10 @@ const LOCALES = { path_copy_failed: 'Pfad konnte nicht kopiert werden: ', session_rename: 'Unterhaltung umbenennen', session_rename_desc: 'Titel dieser Unterhaltung bearbeiten', + session_copy_link: 'Unterhaltungslink kopieren', + session_copy_link_desc: 'Direkten Link zu dieser Unterhaltung kopieren', + session_link_copied: 'Unterhaltungslink in die Zwischenablage kopiert', + session_link_copy_failed: 'Unterhaltungslink konnte nicht kopiert werden: ', new_file_prompt: 'Neuer Dateiname (z.B. notes.md):', project_name_prompt: 'Projektname:', created: 'Erstellt ', @@ -7923,6 +7947,10 @@ const LOCALES = { path_copy_failed: '\u590d\u5236\u8def\u5f84\u5931\u8d25\uff1a', session_rename: '\u91cd\u547d\u540d\u5bf9\u8bdd', session_rename_desc: '\u7f16\u8f91\u6b64\u5bf9\u8bdd\u7684\u6807\u9898', + session_copy_link: '复制对话链接', + session_copy_link_desc: '复制此对话的直接链接', + session_link_copied: '对话链接已复制到剪贴板', + session_link_copy_failed: '无法复制对话链接：', new_file_prompt: '新文件名（例如 notes.md）：', project_name_prompt: '项目名称：', created: '已创建 ', @@ -9058,6 +9086,10 @@ const LOCALES = { path_copy_failed: '\u8907\u88fd\u8def\u5f91\u5931\u6557\uff1a', session_rename: '\u91cd\u65b0\u547d\u540d\u5c0d\u8a71', session_rename_desc: '\u7de8\u8f2f\u6b64\u5c0d\u8a71\u7684\u6a19\u984c', + session_copy_link: '複製對話連結', + session_copy_link_desc: '複製此對話的直接連結', + session_link_copied: '對話連結已複製到剪貼簿', + session_link_copy_failed: '無法複製對話連結：', new_file_prompt: '\u65b0\u6587\u4ef6\u540d\uff08\u4f8b\u5982 notes.md\uff09\uff1a', created: '\u5df2\u5275\u5efa ', create_failed: '\u5275\u5efa\u5931\u6557\uff1a', @@ -10430,6 +10462,10 @@ const LOCALES = { path_copy_failed: 'Falha ao copiar caminho: ', session_rename: 'Renomear conversa', session_rename_desc: 'Editar o título desta conversa', + session_copy_link: 'Copiar link da conversa', + session_copy_link_desc: 'Copia um link direto para esta conversa', + session_link_copied: 'Link da conversa copiado para a área de transferência', + session_link_copy_failed: 'Falha ao copiar link da conversa: ', new_file_prompt: 'Nome do novo arquivo (ex: notes.md):', project_name_prompt: 'Nome do projeto:', created: 'Criado ', @@ -11621,6 +11657,10 @@ const LOCALES = { path_copy_failed: '경로 복사 실패: ', session_rename: '대화 이름 변경', session_rename_desc: '이 대화의 제목 편집', + session_copy_link: '대화 링크 복사', + session_copy_link_desc: '이 대화로 바로 가는 링크 복사', + session_link_copied: '대화 링크가 클립보드에 복사되었습니다', + session_link_copy_failed: '대화 링크를 복사하지 못했습니다: ', new_file_prompt: 'New file name (e.g. notes.md):', project_name_prompt: 'Project name:', created: '생성됨: ', @@ -12841,6 +12881,10 @@ const LOCALES = { path_copy_failed: 'Échec de la copie du chemin :', session_rename: 'Renommer la conversation', session_rename_desc: 'Modifier le titre de cette conversation', + session_copy_link: 'Copier le lien de conversation', + session_copy_link_desc: 'Copier un lien direct vers cette conversation', + session_link_copied: 'Lien de conversation copié dans le presse-papiers', + session_link_copy_failed: 'Impossible de copier le lien de conversation : ', new_file_prompt: 'Nouveau nom de fichier (par exemple notes.md) :', project_name_prompt: 'Nom du projet :', created: 'Créé', @@ -14142,6 +14186,10 @@ const LOCALES = { path_copy_failed: 'Yol kopyalanamadı:', session_rename: 'Konuşmayı yeniden adlandır', session_rename_desc: 'Bu görüşmenin başlığını düzenleyin', + session_copy_link: 'Konuşma bağlantısını kopyala', + session_copy_link_desc: 'Bu konuşmaya doğrudan bağlantı kopyala', + session_link_copied: 'Konuşma bağlantısı panoya kopyalandı', + session_link_copy_failed: 'Konuşma bağlantısı kopyalanamadı: ', new_file_prompt: 'Yeni dosya adı (örn. Notes.md):', project_name_prompt: 'Proje adı:', created: 'Oluşturuldu', diff --git a/static/messages.js b/static/messages.js index d9209cceae..bcc6cb0ec9 100644 --- a/static/messages.js +++ b/static/messages.js @@ -1126,10 +1126,20 @@ function attachLiveStream(activeSid, streamId, uploaded=[], options={}){ } // Allowed URL schemes for anchors and images rendered from agent-streamed markdown. // Raw file:// anchors are rewritten to /api/media before the user can click them. - const _SMD_SAFE_URL_RE=/^(?:https?:|mailto:|tel:|\/|#|\?|\.|api)/i; + const _SMD_SAFE_URL_RE=/^(?:https?:|mailto:|tel:|\/|#|\?|\.|api|session\/)/i; const _SMD_SAFE_IMG_URL_RE=/^(?:https?:|mailto:|tel:|\/|#|\?|\.)/i; function _smdLinkHref(raw){ const href=String(raw||''); + if(/^session:\/\//i.test(href)){ + const sid=href.replace(/^session:\/\//i,'').split(/[?#]/)[0]; + try{ + const decoded=decodeURIComponent(sid); + if(typeof _sessionUrlForSid==='function') return _sessionUrlForSid(decoded); + return 'session/'+encodeURIComponent(decoded); + }catch(_){ + return 'session/'+encodeURIComponent(sid); + } + } if(/^workspace:\/\//i.test(href)){ try{ const rel=decodeURIComponent(href.replace(/^workspace:\/\//i,'')).replace(/^~\//,'').replace(/^\.\//,''); @@ -1154,7 +1164,7 @@ function attachLiveStream(activeSid, streamId, uploaded=[], options={}){ const _a=root.querySelectorAll('a[href]'); for(let i=0;i<_a.length;i++){ const n=_a[i],v=n.getAttribute('href')||''; - if(/^(file|workspace):\/\//i.test(v)){n.setAttribute('href',_smdLinkHref(v));continue;} + if(/^(file|workspace|session):\/\//i.test(v)){n.setAttribute('href',_smdLinkHref(v));n.classList&&/^session:\/\//i.test(v)&&n.classList.add('session-link');continue;} if(!_SMD_SAFE_URL_RE.test(v)){n.removeAttribute('href');n.setAttribute('data-blocked-scheme','1');} } const _im=root.querySelectorAll('img[src]'); @@ -1265,8 +1275,12 @@ function attachLiveStream(activeSid, streamId, uploaded=[], options={}){ const isHref=window.smd&&attr===window.smd.HREF; const isSrc=window.smd&&attr===window.smd.SRC; const safeUrl=isSrc?_SMD_SAFE_IMG_URL_RE:_SMD_SAFE_URL_RE; - if(isHref&&/^(file|workspace):\/\//i.test(String(value||''))){ + if(isHref&&/^(file|workspace|session):\/\//i.test(String(value||''))){ baseSetAttr(data,attr,_smdLinkHref(value)); + if(/^session:\/\//i.test(String(value||''))){ + const node=data&&data.nodes&&data.nodes[data.index]; + if(node&&node.classList) node.classList.add('session-link'); + } return; } if((isHref||isSrc)&&!safeUrl.test(String(value||''))){ diff --git a/static/sessions.js b/static/sessions.js index ba4e203fe5..f16a7e17e6 100644 --- a/static/sessions.js +++ b/static/sessions.js @@ -10,6 +10,7 @@ const ICONS={ trash:'', more:'', edit:'', + link:'', }; // Tracks which session_id is currently being loaded. Used to discard stale @@ -2017,6 +2018,77 @@ function _buildSessionAction(label, meta, icon, onSelect, extraClass=''){ return opt; } +function _sessionMarkdownLabel(session){ + const sid=session&&session.session_id?String(session.session_id):''; + const title=String((session&&(session.title||session.name))||'Conversation').replace(/\s+/g,' ').trim()||'Conversation'; + const shortSid=sid?sid.slice(0,12):''; + const label=shortSid?`${title} (${shortSid})`:title; + return label.replace(/([\\\[\]])/g,'\\$1').slice(0,120); +} + +function _sessionMarkdownUrlSid(sid){ + return encodeURIComponent(String(sid||'')).replace(/[()]/g, ch => ch==='('?'%28':'%29'); +} + +function _sessionInternalReferenceForSession(session){ + const sid=session&&session.session_id; + if(!sid) return ''; + return `[${_sessionMarkdownLabel(session)}](session://${_sessionMarkdownUrlSid(sid)})`; +} + +async function _copyTextToClipboard(text){ + if(navigator&&navigator.clipboard&&typeof navigator.clipboard.writeText==='function'){ + await navigator.clipboard.writeText(text); + return true; + } + const ta=document.createElement('textarea'); + ta.value=text; + ta.setAttribute('readonly',''); + ta.style.position='fixed'; + ta.style.left='-9999px'; + ta.style.top='0'; + document.body.appendChild(ta); + ta.select(); + try{return document.execCommand('copy');} + finally{ta.remove();} +} + +async function _copySessionLink(session){ + const sid=session&&session.session_id; + if(!sid) return; + const ref=_sessionInternalReferenceForSession(session); + try{ + await _copyTextToClipboard(ref); + showToast(t('session_link_copied')); + }catch(err){ + showToast(t('session_link_copy_failed')+(err&&err.message?err.message:err)); + } +} + +function _mountSessionActionMenu(menu, session, anchorEl){ + document.body.appendChild(menu); + _sessionActionMenu = menu; + _sessionActionAnchor = anchorEl; + _sessionActionSessionId = session.session_id; + if(anchorEl.classList&&anchorEl.classList.contains('session-actions-trigger')) anchorEl.classList.add('active'); + const row=anchorEl.closest('.session-item'); + if(row) row.classList.add('menu-open'); + _positionSessionActionMenu(anchorEl); + _playSessionActionMenuEntrance(menu); +} + +function _appendSessionCopyLinkAction(menu, session){ + menu.appendChild(_buildSessionAction( + t('session_copy_link'), + t('session_copy_link_desc'), + ICONS.link, + async()=>{ + closeSessionActionMenu(); + await _copySessionLink(session); + } + )); +} + function _appendSessionDuplicateAction(menu, session){ menu.appendChild(_buildSessionAction( t('session_duplicate'), @@ -2077,7 +2149,7 @@ async function _archiveSession(session, archived=true, beforeListRender=null){ } function _openSessionActionMenu(session, anchorEl){ - if(_isReadOnlySession(session)){ if(typeof showToast==='function') showToast('Read-only imported sessions cannot be modified.',3000); return; } + const isReadOnly = _isReadOnlySession(session); if(_sessionActionMenu && _sessionActionSessionId===session.session_id && _sessionActionAnchor===anchorEl){ closeSessionActionMenu(); return; @@ -2088,6 +2160,11 @@ function _openSessionActionMenu(session, anchorEl){ const isExternalSession = isMessagingSession || isCliSession; const menu=document.createElement('div'); menu.className='session-action-menu'; + _appendSessionCopyLinkAction(menu, session); + if(isReadOnly){ + _mountSessionActionMenu(menu, session, anchorEl); + return; + } // Rename — first menu item by request (#1764). Double-click rename is // timing-sensitive: the first click frequently registers as "open the // chat" before the second click arrives, so users open the conversation @@ -2209,15 +2286,7 @@ function _openSessionActionMenu(session, anchorEl){ 'danger' )); } - document.body.appendChild(menu); - _sessionActionMenu = menu; - _sessionActionAnchor = anchorEl; - _sessionActionSessionId = session.session_id; - if(anchorEl.classList&&anchorEl.classList.contains('session-actions-trigger')) anchorEl.classList.add('active'); - const row=anchorEl.closest('.session-item'); - if(row) row.classList.add('menu-open'); - _positionSessionActionMenu(anchorEl); - _playSessionActionMenuEntrance(menu); + _mountSessionActionMenu(menu, session, anchorEl); } document.addEventListener('click',e=>{ diff --git a/static/ui.js b/static/ui.js index 50ffce7863..43ba2765da 100644 --- a/static/ui.js +++ b/static/ui.js @@ -628,6 +628,16 @@ function _closeImgLightbox(lb) { document.addEventListener('click', e => { if(!e.target || !e.target.closest) return; + const sessionLink=e.target.closest('a.session-link[href]'); + if(sessionLink){ + const href=sessionLink.getAttribute('href')||''; + const m=href.match(/(?:^|\/)session\/([^?#]+)/i); + if(m&&typeof loadSession==='function'){ + e.preventDefault(); + try{loadSession(decodeURIComponent(m[1]));}catch(_){loadSession(m[1]);} + } + return; + } const workspaceLink=e.target.closest('a[href^="#workspace="]'); if(workspaceLink){ e.preventDefault(); @@ -3157,7 +3167,7 @@ function renderMd(raw){ t=t.replace(/\x00C(\d+)\x00/g,(_,i)=>_code_stash[+i]); // Stash [label](url) links before autolink so the URL in href= is not re-linked const _link_stash=[]; - t=t.replace(/\[([^\]]+)\]\(((?:https?:\/\/|file:\/\/|workspace:\/\/|mailto:|tel:)[^\s\)]+)\)/g,(_,lb,u)=>{_link_stash.push(`${esc(lb)}`);return `\x00L${_link_stash.length-1}\x00`;}); + t=t.replace(/\[([^\]]+)\]\(((?:https?:\/\/|file:\/\/|workspace:\/\/|session:\/\/|mailto:|tel:)[^\s\)]+)\)/g,(_,lb,u)=>{_link_stash.push(_markdownAnchor(lb,u));return `\x00L${_link_stash.length-1}\x00`;}); t=t.replace(/(https?:\/\/[^\s<>"')\]]+)/g,(url)=>{const trail=url.match(/[.,;:!?)]$/)?url.slice(-1):'';const clean=trail?url.slice(0,-1):url;return `${esc(clean)}${trail}`;}); t=t.replace(/\x00L(\d+)\x00/g,(_,i)=>_link_stash[+i]); t=t.replace(/\x00G(\d+)\x00/g,(_,i)=>_img_stash[+i]); @@ -3250,7 +3260,7 @@ function renderMd(raw){ // Stash existing tags first to avoid re-linking already-linked URLs. const _a_stash=[]; s=s.replace(/(]*>[\s\S]*?<\/a>)/g,m=>{_a_stash.push(m);return `\x00A${_a_stash.length-1}\x00`;}); - s=s.replace(/\[([^\]]+)\]\(((?:https?:\/\/|file:\/\/|workspace:\/\/|mailto:|tel:)[^\s\)]+)\)/g,(_,label,url)=>`${esc(label)}`); + s=s.replace(/\[([^\]]+)\]\(((?:https?:\/\/|file:\/\/|workspace:\/\/|session:\/\/|mailto:|tel:)[^\s\)]+)\)/g,(_,label,url)=>_markdownAnchor(label,url)); s=s.replace(/\x00A(\d+)\x00/g,(_,i)=>_a_stash[+i]); // Restore raw 
 only after markdown rewrites so literal preformatted
   // content stays placeholder-protected, then let the sanitizer normalize tags.
@@ -3268,6 +3278,16 @@ function renderMd(raw){
   }
   function _markdownHref(raw){
     const href=String(raw||'').replace(/"/g,'%22');
+    if(/^session:\/\//i.test(href)){
+      const sid=href.replace(/^session:\/\//i,'').split(/[?#]/)[0];
+      try{
+        const decoded=decodeURIComponent(sid);
+        if(typeof _sessionUrlForSid==='function') return _sessionUrlForSid(decoded);
+        return 'session/'+encodeURIComponent(decoded);
+      }catch(_){
+        return 'session/'+encodeURIComponent(sid);
+      }
+    }
     if(/^workspace:\/\//i.test(href)){
       try{
         const rel=decodeURIComponent(href.replace(/^workspace:\/\//i,'')).replace(/^~\//,'').replace(/^\.\//,'');
@@ -3286,6 +3306,11 @@ function renderMd(raw){
     }
     return href;
   }
+  function _markdownAnchor(label,rawUrl){
+    const href=_markdownHref(rawUrl);
+    const internal=/^session:\/\//i.test(String(rawUrl||'')) || /^(?:\/[^?#]*)?\/session\/[^?#]+|^session\/[^?#]+/i.test(href);
+    return `${esc(label)}`;
+  }
   function _isSafeUrl(v, img){
     const raw=_safeAttrValue(v);
     const compact=raw.replace(/[\u0000-\u001f\u007f\s]+/g,'').toLowerCase();
@@ -3294,7 +3319,7 @@ function renderMd(raw){
     if(/^https?:\/\//i.test(raw)) return true;
     if(/^(mailto:|tel:)/i.test(raw)) return true;
     if(img && /^api\//i.test(raw)) return true;
-    if(!img && (/^api\//i.test(raw) || /^#/.test(raw))) return true;
+    if(!img && (/^api\//i.test(raw) || /^#/.test(raw) || /^session\//i.test(raw) || /^\/[^?#]*\/session\/[^?#]+/i.test(raw) || /^\/session\/[^?#]+/i.test(raw))) return true;
     return false;
   }
   function _attrs(raw){
@@ -3342,7 +3367,7 @@ function renderMd(raw){
       if(!_isSafeUrl(a.href,false)) return '';
       const target=a.target==='_blank'?' target="_blank"':'';
       const rel=a.rel==='noopener'?' rel="noopener"':'';
-      const cls=_cls(a.class,['msg-media-link','skill-linked-file','skill-file-back']);
+      const cls=_cls(a.class,['msg-media-link','skill-linked-file','skill-file-back','session-link']);
       const download=a.download?` download="${esc(a.download)}"`:'';
       return ``;
     }
diff --git a/tests/test_session_copy_link_action.py b/tests/test_session_copy_link_action.py
new file mode 100644
index 0000000000..63a91b57e0
--- /dev/null
+++ b/tests/test_session_copy_link_action.py
@@ -0,0 +1,76 @@
+from pathlib import Path
+
+ROOT = Path(__file__).resolve().parents[1]
+SESSIONS_JS = (ROOT / "static" / "sessions.js").read_text(encoding="utf-8")
+I18N_JS = (ROOT / "static" / "i18n.js").read_text(encoding="utf-8")
+UI_JS = (ROOT / "static" / "ui.js").read_text(encoding="utf-8")
+MESSAGES_JS = (ROOT / "static" / "messages.js").read_text(encoding="utf-8")
+
+
+def test_session_action_menu_has_copy_link_action():
+    assert "ICONS.link" in SESSIONS_JS
+    assert "_appendSessionCopyLinkAction(menu, session);" in SESSIONS_JS
+    assert "t('session_copy_link')" in SESSIONS_JS
+    assert "t('session_copy_link_desc')" in SESSIONS_JS
+
+
+def test_session_link_copies_internal_markdown_reference_not_external_url():
+    assert "function _sessionInternalReferenceForSession" in SESSIONS_JS
+    assert "session://${_sessionMarkdownUrlSid(sid)}" in SESSIONS_JS
+    assert "_copyTextToClipboard(ref)" in SESSIONS_JS
+    assert "function _sessionAbsoluteUrlForSid" not in SESSIONS_JS
+
+
+def test_session_link_markdown_url_encodes_parentheses():
+    assert "function _sessionMarkdownUrlSid" in SESSIONS_JS
+    assert "encodeURIComponent(String(sid||''))" in SESSIONS_JS
+    assert "replace(/[()]/g" in SESSIONS_JS
+    assert "%28" in SESSIONS_JS
+    assert "%29" in SESSIONS_JS
+
+
+def test_session_link_label_collapses_multiline_titles():
+    assert ".replace(/\\s+/g,' ')" in SESSIONS_JS
+
+
+def test_copy_link_has_clipboard_fallback():
+    assert "navigator.clipboard.writeText" in SESSIONS_JS
+    assert "document.execCommand('copy')" in SESSIONS_JS
+    assert "showToast(t('session_link_copied'))" in SESSIONS_JS
+    assert "t('session_link_copy_failed')" in SESSIONS_JS
+
+
+def test_read_only_sessions_can_still_open_actions_for_copy_link():
+    start = SESSIONS_JS.index("function _openSessionActionMenu(session, anchorEl){")
+    end = SESSIONS_JS.index("document.addEventListener('click'", start)
+    open_menu_block = SESSIONS_JS[start:end]
+    assert "Read-only imported sessions cannot be modified" not in open_menu_block
+    assert "const isReadOnly = _isReadOnlySession(session);" in open_menu_block
+    assert "if(isReadOnly){\n    _mountSessionActionMenu(menu, session, anchorEl);\n    return;\n  }" in open_menu_block
+
+
+def test_copy_link_i18n_keys_have_english_and_german_labels():
+    for key in [
+        "session_copy_link",
+        "session_copy_link_desc",
+        "session_link_copied",
+        "session_link_copy_failed",
+    ]:
+        assert I18N_JS.count(key) >= 2, f"{key} should be defined in English and German"
+    assert "Copy conversation link" in I18N_JS
+    assert "Unterhaltungslink kopieren" in I18N_JS
+
+
+def test_rendered_session_reference_is_internal_link():
+    assert "session:\\/\\/" in UI_JS
+    assert "function _markdownAnchor" in UI_JS
+    assert "class=\"session-link\"" in UI_JS
+    assert "const sessionLink=e.target.closest('a.session-link[href]');" in UI_JS
+    assert "loadSession(decodeURIComponent(m[1]))" in UI_JS
+
+
+def test_streaming_markdown_keeps_session_refs_internal():
+    assert "session:\\/\\/" in MESSAGES_JS
+    assert "session-link" in MESSAGES_JS
+    assert "_smdLinkHref" in MESSAGES_JS
+    assert "^(file|workspace|session)" in MESSAGES_JS

From ce4026660eefc4422140f5cdacef704b7721f224 Mon Sep 17 00:00:00 2001
From: ai-ag2026 
Date: Sat, 30 May 2026 16:31:22 +0200
Subject: [PATCH 302/349] test: harden session link sanitization

---
 static/ui.js                        | 21 +++++++++++++++++++--
 tests/test_renderer_js_behaviour.py | 26 +++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/static/ui.js b/static/ui.js
index 43ba2765da..4ca46c0f9b 100644
--- a/static/ui.js
+++ b/static/ui.js
@@ -3306,9 +3306,26 @@ function renderMd(raw){
     }
     return href;
   }
+  function _isInternalSessionHref(raw){
+    const href=String(raw||'').trim();
+    if(/^session\/[^?#]+/i.test(href)) return true;
+    try{
+      const base=(typeof document!=='undefined'&&document.baseURI)||
+        (typeof window!=='undefined'&&window.location&&window.location.href)||
+        'http://localhost/';
+      const url=new URL(href,base);
+      const baseUrl=new URL(base,base);
+      if(url.origin!==baseUrl.origin) return false;
+      const basePath=baseUrl.pathname.replace(/(?:index\.html)?$/,'').replace(/\/[^/]*$/,'/');
+      const root=basePath.endsWith('/')?basePath:basePath+'/';
+      return url.pathname.startsWith(root+'session/')||url.pathname.startsWith('/session/');
+    }catch(_){
+      return false;
+    }
+  }
   function _markdownAnchor(label,rawUrl){
     const href=_markdownHref(rawUrl);
-    const internal=/^session:\/\//i.test(String(rawUrl||'')) || /^(?:\/[^?#]*)?\/session\/[^?#]+|^session\/[^?#]+/i.test(href);
+    const internal=/^session:\/\//i.test(String(rawUrl||'')) || _isInternalSessionHref(href);
     return `${esc(label)}`;
   }
   function _isSafeUrl(v, img){
@@ -3319,7 +3336,7 @@ function renderMd(raw){
     if(/^https?:\/\//i.test(raw)) return true;
     if(/^(mailto:|tel:)/i.test(raw)) return true;
     if(img && /^api\//i.test(raw)) return true;
-    if(!img && (/^api\//i.test(raw) || /^#/.test(raw) || /^session\//i.test(raw) || /^\/[^?#]*\/session\/[^?#]+/i.test(raw) || /^\/session\/[^?#]+/i.test(raw))) return true;
+    if(!img && (/^api\//i.test(raw) || /^#/.test(raw) || _isInternalSessionHref(raw))) return true;
     return false;
   }
   function _attrs(raw){
diff --git a/tests/test_renderer_js_behaviour.py b/tests/test_renderer_js_behaviour.py
index 509b1d726b..72a334859d 100644
--- a/tests/test_renderer_js_behaviour.py
+++ b/tests/test_renderer_js_behaviour.py
@@ -33,7 +33,8 @@
 const fs = require('fs');
 const src = fs.readFileSync(process.argv[2], 'utf8');
 global.window = {};
-global.document = { createElement: () => ({ innerHTML: '', textContent: '' }) };
+global.document = { createElement: () => ({ innerHTML: '', textContent: '' }), baseURI: 'http://localhost/app/' };
+function _sessionUrlForSid(sid) { return '/app/session/' + encodeURIComponent(String(sid || '')); }
 const esc = s => String(s ?? '').replace(/[&<>"']/g, c => (
   {'&':'&','<':'<','>':'>','"':'"',"'":'''}[c]));
 const _IMAGE_EXTS=/\.(png|jpg|jpeg|gif|webp|bmp|ico|avif)$/i;
@@ -86,6 +87,29 @@ def _render(driver_path, markdown: str) -> str:
     return result.stdout
 
 
+
+class TestSessionInternalLinks:
+    """Drive renderMd() so session:// hardening covers the real sanitizer path."""
+
+    def test_session_scheme_renders_same_origin_internal_anchor(self, driver_path):
+        out = _render(driver_path, "[Open session](session://abc123)")
+        assert 'class="session-link"' in out
+        assert 'href="/app/session/abc123"' in out
+        assert 'target="_blank"' not in out
+        assert 'rel="noopener"' not in out
+
+    def test_hostile_session_scheme_collapses_to_encoded_session_path(self, driver_path):
+        out = _render(driver_path, "[bad](session://javascript:alert(1))")
+        assert 'class="session-link"' in out
+        assert 'href="/app/session/javascript%3Aalert(1"' in out
+        assert 'href="javascript:' not in out
+        assert 'target="_blank"' not in out
+
+    def test_unrelated_same_origin_session_segment_is_not_allowlisted(self, driver_path):
+        out = _render(driver_path, 'bad')
+        assert 'href="/anything/foo/session/abc"' not in out
+        assert 'bad' in out
+
 # ─────────────────────────────────────────────────────────────────────────────
 # Blockquote prefix strip — the bug commit 04e7b53 introduced was a one-char
 # regex regression where `^>[\t]?` (only tab) replaced `^>[ \t]?` (space or

From 8e44dc860946c9823df7eee16aedec502c5b8f03 Mon Sep 17 00:00:00 2001
From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com>
Date: Sat, 30 May 2026 19:49:10 +0200
Subject: [PATCH 303/349] feat: resolve session links in conversation filter

---
 CHANGELOG.md                           |   4 +
 static/sessions.js                     |  98 +++++++++++++++++++--
 tests/test_session_copy_link_action.py | 116 ++++++++++++++++++++++++-
 tests/test_session_lineage_collapse.py |   5 +-
 4 files changed, 214 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bd8d97988..0bf69337cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 
 ## [Unreleased]
 
+### Added
+
+- Conversation filtering now recognizes pasted session references directly: raw session IDs, `session://...` references, `/session/...` URLs, and Markdown session links surface the target conversation while preserving normal content-search hits (#3179).
+
 ## [v0.51.174] — 2026-05-30 — Release ET (stage-batch56 — CLI/gateway session usage in Insights)
 
 ### Added
diff --git a/static/sessions.js b/static/sessions.js
index f16a7e17e6..329fc0cff2 100644
--- a/static/sessions.js
+++ b/static/sessions.js
@@ -2882,6 +2882,91 @@ function _sessionSearchContentPreview(session, query){
   return preview||'';
 }
 
+function _sessionSearchAddIdCandidate(candidates, seen, value){
+  const raw=String(value||'').trim();
+  if(!raw) return;
+  const add=(candidate)=>{
+    const sid=String(candidate||'').trim();
+    if(!sid||seen.has(sid)) return;
+    seen.add(sid);
+    candidates.push(sid);
+  };
+  add(raw);
+  try{add(decodeURIComponent(raw));}catch(_e){}
+}
+
+function _sessionSearchCleanUrlToken(token){
+  let value=String(token||'').trim();
+  value=value.replace(/[\],.;]+$/g,'');
+  while(value.endsWith(')')&&value.indexOf('(')<0) value=value.slice(0,-1);
+  return value;
+}
+
+function _sessionSearchSessionIdCandidates(query){
+  const source=String(query||'').trim();
+  const candidates=[];
+  const seen=new Set();
+  if(!source) return candidates;
+  _sessionSearchAddIdCandidate(candidates,seen,source);
+
+  const inspectUrl=(token)=>{
+    const cleaned=_sessionSearchCleanUrlToken(token);
+    if(!cleaned) return;
+    try{
+      const url=new URL(cleaned,'http://webui.local');
+      const parts=url.pathname.split('/').filter(Boolean);
+      const sessionIdx=parts.findIndex(p=>p.toLowerCase()==='session');
+      if(sessionIdx>=0&&parts[sessionIdx+1]) _sessionSearchAddIdCandidate(candidates,seen,parts[sessionIdx+1]);
+      for(const key of ['session_id','session','sid']){
+        const value=url.searchParams.get(key);
+        if(value) _sessionSearchAddIdCandidate(candidates,seen,value);
+      }
+    }catch(_e){}
+  };
+
+  const markdownLinkRe=/\]\(([^\s)]+)\)/g;
+  let match;
+  while((match=markdownLinkRe.exec(source))) inspectUrl(match[1]);
+
+  const sessionSchemeRe=/session:\/\/([^\s)>\]]+)/gi;
+  while((match=sessionSchemeRe.exec(source))) _sessionSearchAddIdCandidate(candidates,seen,match[1]);
+
+  const urlRe=/(?:https?:\/\/[^\s<>\]]+|\/session\/[^\s<>\]]+|\?[^\s<>\]]+)/gi;
+  while((match=urlRe.exec(source))) inspectUrl(match[0]);
+
+  const queryParamRe=/(?:^|[?&\s])(session_id|session|sid)=([^&#\s)]+)/gi;
+  while((match=queryParamRe.exec(source))) _sessionSearchAddIdCandidate(candidates,seen,match[2]);
+  return candidates;
+}
+
+function _sessionSearchDirectSessionMatches(sessions, query){
+  const candidates=_sessionSearchSessionIdCandidates(query);
+  if(!candidates.length) return [];
+  const candidateIds=new Set(candidates.map(s=>String(s)));
+  return (sessions||[]).filter(s=>s&&candidateIds.has(String(s.session_id||'')));
+}
+
+function _sessionSearchDirectAndTitleMatches(sessions, query){
+  const source=String(query||'').trim();
+  if(!source) return sessions||[];
+  const q=source.toLowerCase();
+  const titleMatches=(sessions||[]).filter(s=>_sessionDisplayTitle(s).toLowerCase().includes(q));
+  const directSessionMatches=_sessionSearchDirectSessionMatches(sessions,source);
+  const directSessionIds=new Set(directSessionMatches.map(s=>s.session_id));
+  return [...directSessionMatches,...titleMatches.filter(s=>!directSessionIds.has(s.session_id))];
+}
+
+function _sessionSearchMergeMatches(sessions, query, contentResults){
+  const source=String(query||'').trim();
+  if(!source) return sessions||[];
+  const directAndTitleMatches=_sessionSearchDirectAndTitleMatches(sessions,source);
+  const directOrTitleIds=new Set(directAndTitleMatches.map(s=>s.session_id));
+  return [
+    ...directAndTitleMatches,
+    ...(contentResults||[]).filter(s=>s&&s.match_type==='content'&&!directOrTitleIds.has(s.session_id))
+  ];
+}
+
 function syncSessionSearchClear(){
   const input=$('sessionSearch');
   const clear=$('sessionSearchClear');
@@ -2919,8 +3004,9 @@ function filterSessions(){
       const data = await api(`/api/sessions/search?q=${encodeURIComponent(requestedQ)}&content=1&depth=5`);
       const currentQ = ($('sessionSearch').value || '').trim();
       if(currentQ!==requestedQ) return;
-      const titleIds = new Set(_allSessions.filter(s => _sessionDisplayTitle(s).toLowerCase().includes(q.toLowerCase())).map(s=>s.session_id));
-      _contentSearchResults = (data.sessions||[]).filter(s => s.match_type === 'content' && !titleIds.has(s.session_id));
+      const directAndTitleMatches=_sessionSearchDirectAndTitleMatches(_allSessions,currentQ);
+      const directOrTitleIds=new Set(directAndTitleMatches.map(s=>s.session_id));
+      _contentSearchResults = (data.sessions||[]).filter(s => s.match_type === 'content' && !directOrTitleIds.has(s.session_id));
       renderSessionListFromCache();
     } catch(e) { /* ignore */ }
   }, 350);
@@ -3518,10 +3604,10 @@ function renderSessionListFromCache(){
   const searchQueryRaw=($('sessionSearch').value||'').trim();
   const q=searchQueryRaw.toLowerCase();
   const activeSidForSidebar=_activeSessionIdForSidebar();
-  const titleMatches=q?_allSessions.filter(s=>_sessionDisplayTitle(s).toLowerCase().includes(q)):_allSessions;
-  // Merge content matches (deduped): content matches appended after title matches
-  const titleIds=new Set(titleMatches.map(s=>s.session_id));
-  const allMatched=q?[...titleMatches,..._contentSearchResults.filter(s=>!titleIds.has(s.session_id))]:titleMatches;
+  // Merge direct session-id/link matches, title matches, then content matches (deduped).
+  // Direct matches must not disable content search: if a user pasted the same
+  // session id into another conversation, that content hit should still appear.
+  const allMatched=_sessionSearchMergeMatches(_allSessions,searchQueryRaw,_contentSearchResults);
   // Never surface ephemeral 0-message sessions in the sidebar — they only become
   // real once the first message is sent. The server already filters them, but this
   // guard ensures a brand-new active session doesn't flash into the list while
diff --git a/tests/test_session_copy_link_action.py b/tests/test_session_copy_link_action.py
index 63a91b57e0..9928a89fa0 100644
--- a/tests/test_session_copy_link_action.py
+++ b/tests/test_session_copy_link_action.py
@@ -1,10 +1,62 @@
+import json
+import shutil
+import subprocess
 from pathlib import Path
 
+import pytest
+
 ROOT = Path(__file__).resolve().parents[1]
-SESSIONS_JS = (ROOT / "static" / "sessions.js").read_text(encoding="utf-8")
+SESSIONS_JS_PATH = ROOT / "static" / "sessions.js"
+SESSIONS_JS = SESSIONS_JS_PATH.read_text(encoding="utf-8")
 I18N_JS = (ROOT / "static" / "i18n.js").read_text(encoding="utf-8")
 UI_JS = (ROOT / "static" / "ui.js").read_text(encoding="utf-8")
 MESSAGES_JS = (ROOT / "static" / "messages.js").read_text(encoding="utf-8")
+NODE = shutil.which("node")
+
+
+def _extract_js_function(src: str, name: str) -> str:
+    marker = f"function {name}"
+    start = src.find(marker)
+    assert start >= 0, f"{name} not found"
+    brace = src.find("{", start)
+    assert brace > start, f"{name} body not found"
+    depth = 1
+    i = brace + 1
+    while depth and i < len(src):
+        if src[i] == "{":
+            depth += 1
+        elif src[i] == "}":
+            depth -= 1
+        i += 1
+    assert depth == 0, f"{name} body did not close"
+    return src[start:i]
+
+
+def _run_session_search_helper(cases):
+    if NODE is None:
+        pytest.skip("node not on PATH")
+    driver = "\n".join(
+        [
+            "function _sessionDisplayTitle(s){return String((s&&s.title)||'');}",
+            _extract_js_function(SESSIONS_JS, "_sessionSearchAddIdCandidate"),
+            _extract_js_function(SESSIONS_JS, "_sessionSearchCleanUrlToken"),
+            _extract_js_function(SESSIONS_JS, "_sessionSearchSessionIdCandidates"),
+            _extract_js_function(SESSIONS_JS, "_sessionSearchDirectSessionMatches"),
+            _extract_js_function(SESSIONS_JS, "_sessionSearchDirectAndTitleMatches"),
+            _extract_js_function(SESSIONS_JS, "_sessionSearchMergeMatches"),
+            "const cases = JSON.parse(process.argv[1]);",
+            "const out = cases.map(c => ({candidates: _sessionSearchSessionIdCandidates(c.query), matches: _sessionSearchDirectSessionMatches(c.sessions, c.query).map(s => s.session_id), merged: _sessionSearchMergeMatches(c.sessions, c.query, c.content || []).map(s => s.session_id)}));",
+            "process.stdout.write(JSON.stringify(out));",
+        ]
+    )
+    result = subprocess.run(
+        [NODE, "-e", driver, json.dumps(cases)],
+        capture_output=True,
+        text=True,
+        timeout=10,
+    )
+    assert result.returncode == 0, result.stderr
+    return json.loads(result.stdout)
 
 
 def test_session_action_menu_has_copy_link_action():
@@ -74,3 +126,65 @@ def test_streaming_markdown_keeps_session_refs_internal():
     assert "session-link" in MESSAGES_JS
     assert "_smdLinkHref" in MESSAGES_JS
     assert "^(file|workspace|session)" in MESSAGES_JS
+
+
+def test_conversation_filter_extracts_session_ids_from_links_and_raw_ids():
+    sessions = [
+        {"session_id": "12f0ef3e1a62", "title": "Target"},
+        {"session_id": "abc(def)", "title": "Paren"},
+        {"session_id": "other", "title": "Other"},
+    ]
+    cases = [
+        {"query": "12f0ef3e1a62", "sessions": sessions},
+        {"query": "session://12f0ef3e1a62", "sessions": sessions},
+        {"query": "https://example.test/session/12f0ef3e1a62", "sessions": sessions},
+        {"query": "https://example.test/session/12f0ef3e1a62?foo=bar#chat", "sessions": sessions},
+        {"query": "/session/12f0ef3e1a62", "sessions": sessions},
+        {"query": "see https://example.test/session/12f0ef3e1a62).", "sessions": sessions},
+        {"query": "[Target](session://12f0ef3e1a62)", "sessions": sessions},
+        {"query": "[Target](https://example.test/session/12f0ef3e1a62)", "sessions": sessions},
+        {"query": "?session_id=12f0ef3e1a62", "sessions": sessions},
+        {"query": "https://example.test/session/abc%28def%29", "sessions": sessions},
+        {"query": "session://abc%28def%29", "sessions": sessions},
+    ]
+    out = _run_session_search_helper(cases)
+    assert [row["matches"] for row in out] == [
+        ["12f0ef3e1a62"],
+        ["12f0ef3e1a62"],
+        ["12f0ef3e1a62"],
+        ["12f0ef3e1a62"],
+        ["12f0ef3e1a62"],
+        ["12f0ef3e1a62"],
+        ["12f0ef3e1a62"],
+        ["12f0ef3e1a62"],
+        ["12f0ef3e1a62"],
+        ["abc(def)"],
+        ["abc(def)"],
+    ]
+
+
+def test_conversation_filter_merges_direct_title_and_content_matches_without_dropping_posted_ids():
+    sessions = [
+        {"session_id": "target-123", "title": "Unrelated target title"},
+        {"session_id": "title-hit", "title": "target-123 mentioned in title"},
+        {"session_id": "other", "title": "Other"},
+    ]
+    content = [
+        {"session_id": "target-123", "match_type": "content"},
+        {"session_id": "posted-elsewhere", "match_type": "content"},
+        {"session_id": "ignored-non-content", "match_type": "title"},
+    ]
+    out = _run_session_search_helper([
+        {"query": "target-123", "sessions": sessions, "content": content},
+    ])[0]
+    assert out["merged"] == ["target-123", "title-hit", "posted-elsewhere"]
+
+
+def test_conversation_filter_keeps_content_search_results_when_query_is_session_id():
+    assert "function _sessionSearchMergeMatches" in SESSIONS_JS
+    assert "function _sessionSearchDirectAndTitleMatches" in SESSIONS_JS
+    assert "const allMatched=_sessionSearchMergeMatches(_allSessions,searchQueryRaw,_contentSearchResults);" in SESSIONS_JS
+    assert "const directAndTitleMatches=_sessionSearchDirectAndTitleMatches(_allSessions,currentQ);" in SESSIONS_JS
+    assert "const directOrTitleIds=new Set(directAndTitleMatches.map(s=>s.session_id));" in SESSIONS_JS
+    assert "!directOrTitleIds.has(s.session_id)" in SESSIONS_JS
+    assert "api(`/api/sessions/search?q=${encodeURIComponent(requestedQ)}&content=1&depth=5`)" in SESSIONS_JS
diff --git a/tests/test_session_lineage_collapse.py b/tests/test_session_lineage_collapse.py
index 680d77fb43..0fad3508dc 100644
--- a/tests/test_session_lineage_collapse.py
+++ b/tests/test_session_lineage_collapse.py
@@ -695,8 +695,9 @@ def test_sidebar_search_and_rows_use_read_only_display_title():
     js = SESSIONS_JS_PATH.read_text(encoding="utf-8")
     assert "function _sessionDisplayTitle" in js
     assert "function _sessionTitleTags" in js
-    assert "_allSessions.filter(s=>_sessionDisplayTitle(s).toLowerCase().includes(q))" in js
-    assert "_allSessions.filter(s => _sessionDisplayTitle(s).toLowerCase().includes(q.toLowerCase()))" in js
+    assert "function _sessionSearchDirectAndTitleMatches" in js
+    assert "const titleMatches=(sessions||[]).filter(s=>_sessionDisplayTitle(s).toLowerCase().includes(q));" in js
+    assert "const directAndTitleMatches=_sessionSearchDirectAndTitleMatches(_allSessions,currentQ);" in js
     assert "const rawTitle=_sessionDisplayTitle(s);" in js
     assert "const tags=_sessionTitleTags(rawTitle);" in js
     assert "const segTitle=_sessionDisplayTitle(seg)||t('session_lineage_segment_untitled');" in js

From 9e38b0ff90ab2101843f5b1dbac24c7e9dfb795a Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sat, 30 May 2026 19:16:12 +0000
Subject: [PATCH 304/349] docs(changelog): v0.51.175 release header
 (stage-batch57)

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bf69337cd..6ea3c3410f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,11 @@
 
 ## [Unreleased]
 
+## [v0.51.175] — 2026-05-30 — Release EU (stage-batch57 — internal conversation links)
+
 ### Added
 
+- Internal conversation links: a "Copy conversation link" action copies a Markdown reference (`session://`) for any conversation, and `session://` references render as same-origin in-app links that open the target conversation without a full page reload (#3179). Links are sanitized through the existing safe-URL allowlist (rewritten to `/session/`, label escaped, sid URL-encoded — verified against quote-breakout and script-injection payloads).
 - Conversation filtering now recognizes pasted session references directly: raw session IDs, `session://...` references, `/session/...` URLs, and Markdown session links surface the target conversation while preserving normal content-search hits (#3179).
 
 ## [v0.51.174] — 2026-05-30 — Release ET (stage-batch56 — CLI/gateway session usage in Insights)

From d2aa06686247c492da391b5b9256e59fcbfd77f5 Mon Sep 17 00:00:00 2001
From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com>
Date: Thu, 28 May 2026 15:36:56 +0200
Subject: [PATCH 305/349] feat: surface session attention badges

---
 CHANGELOG.md                                  |   6 +-
 api/clarify.py                                |   9 ++
 api/routes.py                                 |  29 ++++
 static/i18n.js                                |  66 ++++++++
 static/sessions.js                            |  28 +++-
 static/style.css                              |  12 +-
 .../test_issue856_pinned_indicator_layout.py  |   6 +-
 tests/test_session_attention_badges.py        | 146 ++++++++++++++++++
 tests/test_workspace_panel_session_list.py    |   3 +-
 9 files changed, 296 insertions(+), 9 deletions(-)
 create mode 100644 tests/test_session_attention_badges.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bd8d97988..2a4325983f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 
 ## [Unreleased]
 
+### Added
+
+- Sidebar session rows now surface pending approval and clarify work with `attention` metadata from `/api/sessions`, semantic row classes, and visible action-required badges so inactive conversations that need a permission decision or answer are harder to miss (#3190).
+
 ## [v0.51.174] — 2026-05-30 — Release ET (stage-batch56 — CLI/gateway session usage in Insights)
 
 ### Added
@@ -7169,4 +7173,4 @@ Critical regressions introduced during the server.py split, caught by users and
 - **SSE loop did not break on `cancel` event** -- connection hung after cancel
 - **Regression test file added** (`tests/test_regressions.py`): 10 tests, one per introduced bug. These form a permanent regression gate so each class of error can never silently return.
 
----
+---
\ No newline at end of file
diff --git a/api/clarify.py b/api/clarify.py
index 8ad750ac09..f6d16bbbc8 100644
--- a/api/clarify.py
+++ b/api/clarify.py
@@ -168,6 +168,15 @@ def has_pending(session_key: str) -> bool:
         return bool(_gateway_queues.get(session_key))
 
 
+def pending_count(session_key: str) -> int:
+    """Return the number of unresolved clarify prompts for a session."""
+    with _lock:
+        queue = _gateway_queues.get(session_key) or []
+        if queue:
+            return len(queue)
+        return 1 if _pending.get(session_key) else 0
+
+
 def resolve_clarify(session_key: str, response: str, resolve_all: bool = False) -> int:
     """Resolve the oldest pending clarify request for a session."""
     with _lock:
diff --git a/api/routes.py b/api/routes.py
index 4118a3a9cb..fd2196475f 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -2935,6 +2935,7 @@ def submit_pending(session_key: str, approval: dict) -> None:
     from api.clarify import (
         submit_pending as submit_clarify_pending,
         get_pending as get_clarify_pending,
+        pending_count as get_clarify_pending_count,
         resolve_clarify,
         resolve_clarify_by_id,
         sse_subscribe as clarify_sse_subscribe,
@@ -2943,11 +2944,38 @@ def submit_pending(session_key: str, approval: dict) -> None:
 except ImportError:
     submit_clarify_pending = lambda *a, **k: None
     get_clarify_pending = lambda *a, **k: None
+    get_clarify_pending_count = lambda *a, **k: 0
     clarify_sse_subscribe = None
     resolve_clarify = lambda *a, **k: 0
     resolve_clarify_by_id = lambda *a, **k: False
 
 
+def _session_attention_summary(session_id: str) -> dict | None:
+    """Return sidebar attention metadata for pending approval/clarify work."""
+    approval_count = 0
+    with _lock:
+        queue_list = _pending.get(session_id)
+        if isinstance(queue_list, list):
+            approval_count = len(queue_list)
+        elif queue_list:
+            approval_count = 1
+    if approval_count > 0:
+        return {
+            "kind": "approval",
+            "count": approval_count,
+            "severity": "critical",
+        }
+
+    clarify_count = int(get_clarify_pending_count(session_id) or 0)
+    if clarify_count > 0:
+        return {
+            "kind": "clarify",
+            "count": clarify_count,
+            "severity": "question",
+        }
+    return None
+
+
 # ── Login page locale strings ─────────────────────────────────────────────────
 # Add entries here to support more languages on the login page.
 # The key must match the 'language' setting value (from static/i18n.js LOCALES).
@@ -4805,6 +4833,7 @@ def handle_get(handler, parsed) -> bool:
                 item = dict(s)
                 if isinstance(item.get("title"), str):
                     item["title"] = _redact_text(item["title"])
+                item["attention"] = _session_attention_summary(str(item.get("session_id") or ""))
                 safe_merged.append(item)
             diag.stage("response_write")
             return j(handler, {
diff --git a/static/i18n.js b/static/i18n.js
index c8d9fb45f3..c1b04632dd 100644
--- a/static/i18n.js
+++ b/static/i18n.js
@@ -151,6 +151,12 @@ const LOCALES = {
     clarify_send: 'Send',
     clarify_input_placeholder: 'Type your response…',
     clarify_responding: 'Responding\u2026',
+    session_attention_approval: (n) => n === 1 ? 'Approval' : `${n} approvals`,
+    session_attention_clarify: (n) => n === 1 ? 'Question' : `${n} questions`,
+    session_attention_generic: (n) => n === 1 ? 'Attention' : `${n} items`,
+    session_attention_approval_title: 'Waiting for permission decision',
+    session_attention_clarify_title: 'Waiting for your answer',
+    session_attention_generic_title: 'Waiting for user action',
     untitled: 'Untitled',
     n_messages: (n) => `${n} messages`,
     load_older_messages: '↑ Scroll up or click to load older messages',
@@ -1452,6 +1458,12 @@ const LOCALES = {
     clarify_send: 'Invia',
     clarify_input_placeholder: 'Scrivi la tua risposta…',
     clarify_responding: 'Rispondendo\u2026',
+    session_attention_approval: (n) => n === 1 ? 'Approvazione' : `${n} approvazioni`,
+    session_attention_clarify: (n) => n === 1 ? 'Domanda' : `${n} domande`,
+    session_attention_generic: (n) => n === 1 ? 'Attenzione' : `${n} elementi`,
+    session_attention_approval_title: 'In attesa di una decisione di approvazione',
+    session_attention_clarify_title: 'In attesa della tua risposta',
+    session_attention_generic_title: 'In attesa di un’azione dell’utente',
     untitled: 'Senza titolo',
     n_messages: (n) => n === 1 ? `${n} messaggio` : `${n} messaggi`,
     load_older_messages: '↑ Scorri in alto o clicca per caricare i messaggi precedenti',
@@ -2745,6 +2757,12 @@ const LOCALES = {
     clarify_send: '送信',
     clarify_input_placeholder: '回答を入力…',
     clarify_responding: '応答中…',
+    session_attention_approval: (n) => n === 1 ? '承認' : `${n} 件の承認`,
+    session_attention_clarify: (n) => n === 1 ? '質問' : `${n} 件の質問`,
+    session_attention_generic: (n) => n === 1 ? '注意' : `${n} 件`,
+    session_attention_approval_title: '権限判断を待っています',
+    session_attention_clarify_title: '回答を待っています',
+    session_attention_generic_title: 'ユーザー操作を待っています',
     untitled: '無題',
     n_messages: (n) => `${n} 件のメッセージ`,
     load_older_messages: '↑ 上にスクロール、またはクリックして過去のメッセージを読み込む',
@@ -4118,6 +4136,12 @@ const LOCALES = {
     clarify_input_placeholder: 'Введите ответ…',
     clarify_other: 'Другое',
     clarify_responding: 'Отвечаю…',
+    session_attention_approval: (n) => n === 1 ? 'Одобрение' : `${n} одобр.`,
+    session_attention_clarify: (n) => n === 1 ? 'Вопрос' : `${n} вопрос.`,
+    session_attention_generic: (n) => n === 1 ? 'Внимание' : `${n} элем.`,
+    session_attention_approval_title: 'Ожидается решение по разрешению',
+    session_attention_clarify_title: 'Ожидается ваш ответ',
+    session_attention_generic_title: 'Ожидается действие пользователя',
     clarify_send: 'Отправить',
     cmd_compact_alias: 'Устаревший псевдоним для /compress',
     cmd_compress: 'Сжать контекст беседы (использование: /compress [тема])',
@@ -5254,6 +5278,12 @@ const LOCALES = {
     clarify_send: 'Enviar',
     clarify_input_placeholder: 'Escribe tu respuesta…',
     clarify_responding: 'Respondiendo…',
+    session_attention_approval: (n) => n === 1 ? 'Aprobación' : `${n} aprobaciones`,
+    session_attention_clarify: (n) => n === 1 ? 'Pregunta' : `${n} preguntas`,
+    session_attention_generic: (n) => n === 1 ? 'Atención' : `${n} elementos`,
+    session_attention_approval_title: 'Esperando una decisión de permiso',
+    session_attention_clarify_title: 'Esperando tu respuesta',
+    session_attention_generic_title: 'Esperando una acción del usuario',
     untitled: 'Sin título',
     n_messages: (n) => `${n} mensajes`,
     load_older_messages: '↑ Desplázate hacia arriba o haz clic para cargar mensajes anteriores',
@@ -6483,6 +6513,12 @@ const LOCALES = {
     clarify_send: 'Senden',
     clarify_input_placeholder: 'Gib deine Antwort ein…',
     clarify_responding: 'Antwortet\u2026',
+    session_attention_approval: (n) => n === 1 ? 'Freigabe' : `${n} Freigaben`,
+    session_attention_clarify: (n) => n === 1 ? 'Frage' : `${n} Fragen`,
+    session_attention_generic: (n) => n === 1 ? 'Achtung' : `${n} Hinweise`,
+    session_attention_approval_title: 'Wartet auf deine Freigabeentscheidung',
+    session_attention_clarify_title: 'Wartet auf deine Antwort',
+    session_attention_generic_title: 'Wartet auf eine Benutzeraktion',
     untitled: 'Unbenannt',
     n_messages: (n) => `${n} Nachrichten`,
     load_older_messages: '↑ Nach oben scrollen oder klicken, um ältere Nachrichten zu laden',
@@ -7716,6 +7752,12 @@ const LOCALES = {
     clarify_send: '发送',
     clarify_input_placeholder: '请输入你的回答…',
     clarify_responding: '处理中…',
+    session_attention_approval: (n) => n === 1 ? '审批' : `${n} 个审批`,
+    session_attention_clarify: (n) => n === 1 ? '问题' : `${n} 个问题`,
+    session_attention_generic: (n) => n === 1 ? '注意' : `${n} 项`,
+    session_attention_approval_title: '等待权限决定',
+    session_attention_clarify_title: '等待你的回答',
+    session_attention_generic_title: '等待用户操作',
     untitled: '未命名',
     n_messages: (n) => `${n} 条消息`,
     load_older_messages: '↑ 向上滚动或点击加载更早的消息',
@@ -10183,6 +10225,12 @@ const LOCALES = {
     clarify_send: 'Enviar',
     clarify_input_placeholder: 'Digite sua resposta…',
     clarify_responding: 'Respondendo…',
+    session_attention_approval: (n) => n === 1 ? 'Aprovação' : `${n} aprovações`,
+    session_attention_clarify: (n) => n === 1 ? 'Pergunta' : `${n} perguntas`,
+    session_attention_generic: (n) => n === 1 ? 'Atenção' : `${n} itens`,
+    session_attention_approval_title: 'Aguardando decisão de permissão',
+    session_attention_clarify_title: 'Aguardando sua resposta',
+    session_attention_generic_title: 'Aguardando ação do usuário',
     untitled: 'Sem título',
     n_messages: (n) => `${n} mensagens`,
     load_older_messages: '↑ Role para cima ou clique para carregar mensagens mais antigas',
@@ -11361,6 +11409,12 @@ const LOCALES = {
     clarify_send: '보내기',
     clarify_input_placeholder: '응답을 입력하세요…',
     clarify_responding: '응답 중\u2026',
+    session_attention_approval: (n) => n === 1 ? '승인' : `${n}개 승인`,
+    session_attention_clarify: (n) => n === 1 ? '질문' : `${n}개 질문`,
+    session_attention_generic: (n) => n === 1 ? '주의' : `${n}개 항목`,
+    session_attention_approval_title: '권한 결정을 기다리는 중',
+    session_attention_clarify_title: '답변을 기다리는 중',
+    session_attention_generic_title: '사용자 작업을 기다리는 중',
     untitled: '제목 없음',
     n_messages: (n) => `${n}개 메시지`,
     load_older_messages: '↑ 위로 스크롤하거나 클릭하여 이전 메시지 불러오기',
@@ -12660,6 +12714,12 @@ const LOCALES = {
     clarify_send: 'Envoyer',
     clarify_input_placeholder: 'Tapez votre réponse…',
     clarify_responding: 'Répondre\u2026',
+    session_attention_approval: (n) => n === 1 ? 'Approbation' : `${n} approbations`,
+    session_attention_clarify: (n) => n === 1 ? 'Question' : `${n} questions`,
+    session_attention_generic: (n) => n === 1 ? 'Attention' : `${n} éléments`,
+    session_attention_approval_title: 'En attente d’une décision d’autorisation',
+    session_attention_clarify_title: 'En attente de votre réponse',
+    session_attention_generic_title: 'En attente d’une action utilisateur',
     untitled: 'Sans titre',
     load_older_messages: '↑ Faites défiler vers le haut ou cliquez pour charger les anciens messages',
     session_jump_start: 'Commencer',
@@ -13884,6 +13944,12 @@ const LOCALES = {
     clarify_send: 'Göndermek',
     clarify_input_placeholder: 'Yanıtınızı yazın\u2026',
     clarify_responding: 'Yanıt veriliyor\u2026',
+    session_attention_approval: (n) => n === 1 ? 'Onay' : `${n} onay`,
+    session_attention_clarify: (n) => n === 1 ? 'Soru' : `${n} soru`,
+    session_attention_generic: (n) => n === 1 ? 'Dikkat' : `${n} öğe`,
+    session_attention_approval_title: 'İzin kararı bekleniyor',
+    session_attention_clarify_title: 'Yanıtınız bekleniyor',
+    session_attention_generic_title: 'Kullanıcı eylemi bekleniyor',
     untitled: 'İsimsiz',
     n_messages: (n) => `${n}개 메시지`,
     load_older_messages: '↑ Eski mesajları yüklemek için yukarı kaydırın veya tıklayın',
diff --git a/static/sessions.js b/static/sessions.js
index ba4e203fe5..e4a63e4223 100644
--- a/static/sessions.js
+++ b/static/sessions.js
@@ -3459,6 +3459,7 @@ function renderSessionListFromCache(){
   // _allSessions is stale from a prior render (#1171).
   const withMessages=allMatched.filter(s=>
     (s.message_count||0)>0 ||
+    _sessionAttentionState(s) ||
     _isSessionEffectivelyStreaming(s) ||
     !!s.active_stream_id ||
     !!s.pending_user_message ||
@@ -3769,6 +3770,20 @@ function renderSessionListFromCache(){
   _pendingSessionReflowPositions=null;
   _playSessionRowsReflowFromPositions(reflowBefore,reflowTimeout,_sessionPrefersReducedMotion);
   // Note: declared after the groups loop but available via function hoisting.
+  function _sessionAttentionState(s){
+    const attention=s&&s.attention&&typeof s.attention==='object'?s.attention:null;
+    if(!attention||!attention.kind||!Number.isFinite(Number(attention.count))||Number(attention.count)<=0)return null;
+    const kind=String(attention.kind)==='approval'?'approval':(String(attention.kind)==='clarify'?'clarify':'attention');
+    const count=Math.max(1,Number(attention.count)||1);
+    const labelKey=kind==='approval'?'session_attention_approval':(kind==='clarify'?'session_attention_clarify':'session_attention_generic');
+    const titleKey=kind==='approval'?'session_attention_approval_title':(kind==='clarify'?'session_attention_clarify_title':'session_attention_generic_title');
+    const fallback=kind==='approval'?(count===1?'Approval':`${count} approvals`):(kind==='clarify'?(count===1?'Question':`${count} questions`):(count===1?'Attention':`${count} items`));
+    const titleFallback=kind==='approval'?'Waiting for permission decision':(kind==='clarify'?'Waiting for your answer':'Waiting for user action');
+    const label=(typeof t==='function')?t(labelKey,count):fallback;
+    const title=(typeof t==='function')?t(titleKey,count):titleFallback;
+    return {kind,count,severity:String(attention.severity||''),label,title};
+  }
+
   function _renderOneSession(s, isPinnedGroup=false){
     const el=document.createElement('div');
     const isActive=_sessionLineageContainsSession(s,activeSidForSidebar);
@@ -3776,8 +3791,10 @@ function renderSessionListFromCache(){
     _rememberRenderedStreamingState(s, isStreaming);
     _rememberRenderedSessionSnapshot(s);
     const hasUnread=_hasUnreadForSession(s)&&!isActive;
+    const attention=_sessionAttentionState(s);
+    const attentionClass=attention?(attention.kind==='approval'?' attention-approval':(attention.kind==='clarify'?' attention-clarify':' attention-attention')):'';
     const readOnly=_isReadOnlySession(s);
-    el.className='session-item'+(isActive?' active':'')+(isActive&&S.session&&S.session._flash?' new-flash':'')+(s.archived?' archived':'')+(isStreaming?' streaming':'')+(hasUnread?' unread':'');
+    el.className='session-item'+(isActive?' active':'')+(isActive&&S.session&&S.session._flash?' new-flash':'')+(s.archived?' archived':'')+(isStreaming?' streaming':'')+(hasUnread?' unread':'')+(attention?' needs-attention':'')+attentionClass;
     const swipeReturnOffset=_sessionSwipeReturnOffsets.get(s.session_id);
     if(swipeReturnOffset!==undefined){
       _sessionSwipeReturnOffsets.delete(s.session_id);
@@ -3855,7 +3872,7 @@ function renderSessionListFromCache(){
     title.title=readOnly?'Read-only imported session':'Double-click to rename';
     const tsMs=_sessionTimestampMs(s);
     const ts=document.createElement('span');
-    const hasAttentionState=isStreaming||hasUnread;
+    const hasAttentionState=isStreaming||hasUnread||Boolean(attention);
     ts.className='session-time'+(hasAttentionState?' is-hidden':'');
     ts.textContent=hasAttentionState?'':_formatRelativeSessionTime(tsMs);
     titleRow.appendChild(title);
@@ -3928,6 +3945,13 @@ function renderSessionListFromCache(){
       };
       titleRow.appendChild(childCountEl);
     }
+    if(attention){
+      const attentionEl=document.createElement('span');
+      attentionEl.className='session-attention-badge session-attention-badge-'+attention.kind;
+      attentionEl.textContent=attention.label;
+      attentionEl.title=attention.title;
+      titleRow.appendChild(attentionEl);
+    }
     titleRow.appendChild(ts);
     sessionText.appendChild(titleRow);
     if(density==='detailed'){
diff --git a/static/style.css b/static/style.css
index acefebf549..982833fbec 100644
--- a/static/style.css
+++ b/static/style.css
@@ -804,7 +804,10 @@
      when they're visible — covered by the hover / streaming / unread /
      menu-open / focus-within rule below. */
   .session-item{padding:8px 8px;margin-bottom:2px;border-radius:8px;cursor:pointer;font-size:13px;color:var(--muted);transition:background .15s,color .15s,transform .5s cubic-bezier(.22,.61,.36,1),box-shadow .15s ease;display:flex;align-items:flex-start;gap:8px;min-width:0;position:relative;touch-action:pan-y;-webkit-tap-highlight-color:transparent;user-select:none;-webkit-user-select:none;-webkit-touch-callout:none;transform:translate3d(var(--session-swipe-offset,0),var(--session-reflow-offset,0),0);}
-  .session-item.streaming,.session-item.unread,.session-item:focus-within,.session-item.menu-open{padding-right:40px;}
+  .session-item.streaming,.session-item.unread,.session-item.needs-attention,.session-item:focus-within,.session-item.menu-open{padding-right:40px;}
+  .session-item.needs-attention{box-shadow:inset 3px 0 0 var(--warning);background:color-mix(in srgb,var(--warning) 8%,transparent);}
+  .session-item.attention-approval{box-shadow:inset 3px 0 0 var(--error);background:color-mix(in srgb,var(--error) 9%,transparent);}
+  .session-item.attention-clarify{box-shadow:inset 3px 0 0 var(--warning);background:color-mix(in srgb,var(--warning) 8%,transparent);}
   @media (hover:hover){.session-item:hover{background:var(--hover-bg);color:var(--text);}}
   .session-item.loading{background:var(--hover-bg);color:var(--text);}
   .session-item.long-pressing{
@@ -937,6 +940,10 @@
   .session-item.active .session-search-preview{color:var(--accent-text);opacity:.72;}
   .session-item.active .session-search-hit{background:var(--accent-bg-strong);color:var(--accent-text);}
   .session-item.active .session-meta{color:var(--accent-text);opacity:.8;}
+  .session-attention-badge{display:inline-flex;align-items:center;justify-content:center;flex-shrink:0;max-width:92px;padding:2px 6px;border-radius:999px;font-size:9px;font-weight:800;line-height:1.2;letter-spacing:.04em;text-transform:uppercase;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:var(--bg);background:var(--warning);box-shadow:0 0 0 1px color-mix(in srgb,var(--warning) 38%,transparent);}
+  .session-attention-badge-approval{background:var(--error);color:#fff;box-shadow:0 0 0 1px color-mix(in srgb,var(--error) 42%,transparent);animation:sessionAttentionPulse 1.6s ease-in-out infinite;}
+  .session-attention-badge-clarify{background:var(--warning);color:var(--bg);}
+  .session-item.active .session-attention-badge{box-shadow:0 0 0 1px color-mix(in srgb,currentColor 35%,transparent);}
   .session-state-indicator{display:inline-flex;align-items:center;justify-content:center;flex-shrink:0;width:10px;height:10px;color:var(--accent);visibility:hidden;}
   .session-attention-indicator{position:absolute;right:6px;top:50%;transform:translateY(-50%);width:26px;height:26px;z-index:1;pointer-events:none;transition:opacity .15s ease,visibility .15s ease;}
   .session-item:hover .session-attention-indicator,.session-item:focus-within .session-attention-indicator,.session-item.menu-open .session-attention-indicator{opacity:0;visibility:hidden;}
@@ -1004,7 +1011,7 @@
     .session-action-menu{animation:none;will-change:auto;}
     .session-item,.session-item.dragging,.session-item.session-reflowing,.session-item.swipe-committed,.session-item.swipe-removing{transition:none;}
     .session-item.long-pressing,.session-item.session-swipe-returning{animation:none;}
-    .session-item.session-list-flip-enter{animation:none;}
+    .session-item.session-list-flip-enter,.session-attention-badge-approval{animation:none;}
   }
   /* Hide overlay during inline rename */
   .session-item:has(.session-title-input) .session-actions{display:none;}
@@ -1013,6 +1020,7 @@
   @keyframes sessionSwipeReturn{0%{opacity:.62;transform:translate3d(var(--session-swipe-return-offset,32px),var(--session-reflow-offset,0),0) scale(.985);}100%{opacity:1;transform:translate3d(0,var(--session-reflow-offset,0),0) scale(1);}}
   @keyframes newflash{0%{background:var(--accent-bg-strong);color:var(--accent);}100%{background:transparent;color:var(--muted);}}
   @keyframes sessionListFlipIn{0%{opacity:0;transform:perspective(700px) rotateX(-8deg) translateY(10px) scale(.985);}100%{opacity:1;transform:perspective(700px) rotateX(0) translateY(0) scale(1);}}
+  @keyframes sessionAttentionPulse{0%,100%{filter:saturate(1);box-shadow:0 0 0 1px color-mix(in srgb,var(--error) 42%,transparent),0 0 0 0 color-mix(in srgb,var(--error) 18%,transparent);}50%{filter:saturate(1.12);box-shadow:0 0 0 1px color-mix(in srgb,var(--error) 55%,transparent),0 0 0 4px color-mix(in srgb,var(--error) 10%,transparent);}}
   @keyframes spin{to{transform:rotate(360deg);}}
   .session-item.new-flash{animation:newflash 1.4s ease-out forwards;}
   .session-item.session-list-flip-enter{animation:sessionListFlipIn .28s cubic-bezier(.2,.8,.2,1) backwards;transform-origin:center top;}
diff --git a/tests/test_issue856_pinned_indicator_layout.py b/tests/test_issue856_pinned_indicator_layout.py
index b7c13056da..36e4acf3d4 100644
--- a/tests/test_issue856_pinned_indicator_layout.py
+++ b/tests/test_issue856_pinned_indicator_layout.py
@@ -80,8 +80,8 @@ def test_state_indicator_uses_right_actions_slot_to_prevent_title_shift():
 
 
 def test_timestamp_hidden_when_attention_state_is_present():
-    assert "+(hasUnread?' unread':'')" in SESSIONS_JS
-    assert "const hasAttentionState=isStreaming||hasUnread;" in SESSIONS_JS
+    assert "+(hasUnread?' unread':'')+(attention?' needs-attention':'')+attentionClass" in SESSIONS_JS
+    assert "const hasAttentionState=isStreaming||hasUnread||Boolean(attention);" in SESSIONS_JS
     assert "ts.className='session-time'+(hasAttentionState?' is-hidden':'');" in SESSIONS_JS
     assert "ts.textContent=hasAttentionState?'':_formatRelativeSessionTime(tsMs);" in SESSIONS_JS
     assert ".session-time.is-hidden{display:none;}" in STYLE_CSS
@@ -95,7 +95,7 @@ def test_timestamp_hidden_when_attention_state_is_present():
     # Instead, hover padding is restored via @media (hover:hover) which only applies to
     # devices with a real hover capability (mouse). Touch/iPad devices satisfy hover:none
     # and skip that block, preventing the layout-reflow mid-tap bug.
-    assert ".session-item.streaming,.session-item.unread,.session-item:focus-within,.session-item.menu-open{padding-right:40px;}" in STYLE_CSS
+    assert ".session-item.streaming,.session-item.unread,.session-item.needs-attention,.session-item:focus-within,.session-item.menu-open{padding-right:40px;}" in STYLE_CSS
     # Desktop hover padding restored via media query (mouse devices only)
     assert "@media (hover:hover)" in STYLE_CSS
     assert ".session-item:hover{padding-right:40px;}" in STYLE_CSS
diff --git a/tests/test_session_attention_badges.py b/tests/test_session_attention_badges.py
new file mode 100644
index 0000000000..372e23a9e5
--- /dev/null
+++ b/tests/test_session_attention_badges.py
@@ -0,0 +1,146 @@
+import io
+import json
+import pathlib
+import sys
+from urllib.parse import urlparse
+
+REPO_ROOT = pathlib.Path(__file__).parent.parent.resolve()
+if str(REPO_ROOT) not in sys.path:
+    sys.path.insert(0, str(REPO_ROOT))
+
+import api.profiles as profiles
+import api.routes as routes
+
+
+class _FakeHandler:
+    def __init__(self):
+        self.status = None
+        self.headers = {}
+        self.wfile = io.BytesIO()
+
+    def send_response(self, status):
+        self.status = status
+
+    def send_header(self, key, value):
+        self.headers[key] = value
+
+    def end_headers(self):
+        pass
+
+    def json_body(self):
+        return json.loads(self.wfile.getvalue().decode("utf-8"))
+
+
+def _clear_attention_state(*session_ids):
+    from api import clarify
+
+    with routes._lock:
+        for sid in session_ids:
+            routes._pending.pop(sid, None)
+            routes._gateway_queues.pop(sid, None)
+    for sid in session_ids:
+        clarify.clear_pending(sid)
+
+
+def test_attention_summary_prefers_pending_approvals_over_clarify_questions():
+    sid = "attention-both-session"
+    _clear_attention_state(sid)
+    try:
+        routes.submit_pending(sid, {"command": "rm -rf /tmp/nope", "description": "Danger"})
+        routes.submit_pending(sid, {"command": "touch /tmp/nope", "description": "Also danger"})
+        routes.submit_clarify_pending(sid, {
+            "question": "Which option?",
+            "choices_offered": ["A", "B", "C"],
+        })
+
+        summary = routes._session_attention_summary(sid)
+
+        assert summary == {
+            "kind": "approval",
+            "count": 2,
+            "severity": "critical",
+        }
+    finally:
+        _clear_attention_state(sid)
+
+
+def test_attention_summary_reports_clarify_when_no_approval_is_pending():
+    sid = "attention-clarify-session"
+    _clear_attention_state(sid)
+    try:
+        routes.submit_clarify_pending(sid, {
+            "question": "Pick deploy target",
+            "choices_offered": ["staging", "prod", "cancel"],
+        })
+        routes.submit_clarify_pending(sid, {
+            "question": "Pick rollout speed",
+            "choices_offered": ["slow", "fast"],
+        })
+
+        summary = routes._session_attention_summary(sid)
+
+        assert summary == {
+            "kind": "clarify",
+            "count": 2,
+            "severity": "question",
+        }
+    finally:
+        _clear_attention_state(sid)
+
+
+def test_sessions_api_includes_attention_summary_for_sidebar_rows(monkeypatch):
+    sid = "attention-api-session"
+    _clear_attention_state(sid)
+    try:
+        routes.submit_pending(sid, {"command": "sudo service restart", "description": "Restart"})
+
+        monkeypatch.setattr(routes, "all_sessions", lambda diag=None: [{
+            "session_id": sid,
+            "title": "Needs approval",
+            "profile": "default",
+            "updated_at": 1,
+            "last_message_at": 1,
+        }])
+        monkeypatch.setattr(routes, "_reconcile_stale_stream_state_for_session_rows", lambda rows: False)
+        monkeypatch.setattr(routes, "load_settings", lambda: {"show_cli_sessions": False})
+        monkeypatch.setattr(profiles, "get_active_profile_name", lambda: "default")
+
+        handler = _FakeHandler()
+        routes.handle_get(handler, urlparse("http://example.com/api/sessions"))
+
+        assert handler.status == 200
+        sessions = handler.json_body()["sessions"]
+        assert sessions[0]["attention"] == {
+            "kind": "approval",
+            "count": 1,
+            "severity": "critical",
+        }
+    finally:
+        _clear_attention_state(sid)
+
+
+def test_session_sidebar_renders_attention_badge_and_semantic_classes():
+    sessions_js = (REPO_ROOT / "static" / "sessions.js").read_text(encoding="utf-8")
+    style_css = (REPO_ROOT / "static" / "style.css").read_text(encoding="utf-8")
+
+    assert "function _sessionAttentionState" in sessions_js
+    assert "needs-attention" in sessions_js
+    assert "attention-approval" in sessions_js
+    assert "attention-clarify" in sessions_js
+    assert "session-attention-badge" in sessions_js
+    assert "session_attention_approval" in sessions_js
+    assert "session_attention_clarify" in sessions_js
+    assert "s.attention" in sessions_js
+    assert "_sessionAttentionState(s) ||" in sessions_js
+
+    i18n_js = (REPO_ROOT / "static" / "i18n.js").read_text(encoding="utf-8")
+    assert "session_attention_approval" in i18n_js
+    assert "session_attention_clarify" in i18n_js
+    assert "session_attention_approval_title" in i18n_js
+    assert "session_attention_clarify_title" in i18n_js
+
+    assert ".session-item.needs-attention" in style_css
+    assert ".session-item.attention-approval" in style_css
+    assert ".session-item.attention-clarify" in style_css
+    assert ".session-attention-badge" in style_css
+    assert "prefers-reduced-motion" in style_css
diff --git a/tests/test_workspace_panel_session_list.py b/tests/test_workspace_panel_session_list.py
index c5ddcac9fd..7132d17f34 100644
--- a/tests/test_workspace_panel_session_list.py
+++ b/tests/test_workspace_panel_session_list.py
@@ -252,10 +252,11 @@ def test_session_item_expands_padding_on_hover_and_attention(self):
         padding-right selector. Touch devices (iPad, phone) see hover:none so
         they skip the @media (hover:hover) block below. Mouse devices see
         hover:hover and get the padding-right on hover.
-        streaming/unread/focus-within/menu-open expand to 40px for all devices."""
+        streaming/unread/needs-attention/focus-within/menu-open expand to 40px for all devices."""
         # Touch-safe combined rule (no :hover in this one)
         sel = (
             ".session-item.streaming,.session-item.unread,"
+            ".session-item.needs-attention,"
             ".session-item:focus-within,"
             ".session-item.menu-open"
         )

From 00e6d953c2c51d7f99e65040854f6e8a925bc35e Mon Sep 17 00:00:00 2001
From: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com>
Date: Sat, 30 May 2026 18:10:14 +0200
Subject: [PATCH 306/349] feat: add distinct attention request sound

Adds a distinct two-tone attention sound (880->660Hz) for approval and
clarify prompts so they are not confused with the existing completion sound,
plus sidebar attention badges + colored rails driven by `attention` metadata
on /api/sessions. Includes lock-safety note: the in-lock
publish_session_list_changed() calls in clarify.py are safe because publish()
only takes the leaf _SESSION_EVENTS_LOCK and never re-acquires clarify._lock
(verified by Opus advisor review).

Co-authored-by: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com>
---
 api/clarify.py                                | 14 ++++
 api/routes.py                                 |  6 +-
 static/messages.js                            | 41 +++++++++-
 static/sessions.js                            | 39 +++++++++
 tests/test_1694_terminal_cleanup_ownership.py | 25 ++++++
 tests/test_attention_session_events.py        | 68 ++++++++++++++++
 tests/test_session_attention_sound.py         | 81 +++++++++++++++++++
 7 files changed, 271 insertions(+), 3 deletions(-)
 create mode 100644 tests/test_attention_session_events.py
 create mode 100644 tests/test_session_attention_sound.py

diff --git a/api/clarify.py b/api/clarify.py
index f6d16bbbc8..f43d40dd05 100644
--- a/api/clarify.py
+++ b/api/clarify.py
@@ -12,6 +12,8 @@
 import uuid
 from typing import Optional
 
+from api.session_events import publish_session_list_changed
+
 
 DEFAULT_TIMEOUT_SECONDS = 120
 _lock = threading.Lock()
@@ -52,6 +54,8 @@ def unregister_gateway_notify(session_key: str) -> None:
     with _lock:
         _gateway_notify_cbs.pop(session_key, None)
         entries = _clear_queue_locked(session_key)
+    if entries:
+        publish_session_list_changed("attention_cleared")
     for entry in entries:
         entry.event.set()
 
@@ -60,6 +64,8 @@ def clear_pending(session_key: str) -> int:
     """Clear any pending clarify prompts for the session without removing the callback."""
     with _lock:
         entries = _clear_queue_locked(session_key)
+    if entries:
+        publish_session_list_changed("attention_cleared")
     for entry in entries:
         entry.event.set()
     return len(entries)
@@ -135,6 +141,9 @@ def submit_pending(session_key: str, data: dict) -> _ClarifyEntry:
                         cb(dict(entry.data))
                     except Exception:
                         pass
+                # Safe to call while holding _lock: publish() only takes the
+                # leaf _SESSION_EVENTS_LOCK and never re-acquires this lock.
+                publish_session_list_changed("attention_pending")
                 return entry
 
         entry = _ClarifyEntry(data)
@@ -145,6 +154,7 @@ def submit_pending(session_key: str, data: dict) -> _ClarifyEntry:
         cb = _gateway_notify_cbs.get(session_key)
         # Notify SSE subscribers from inside _lock for ordering guarantees.
         _clarify_sse_notify(session_key, dict(gw_queue[0].data), len(gw_queue))
+    publish_session_list_changed("attention_pending")
     if cb:
         try:
             cb(data)
@@ -191,6 +201,7 @@ def resolve_clarify(session_key: str, response: str, resolve_all: bool = False)
         else:
             _clear_queue_locked(session_key)
             _clarify_sse_notify(session_key, None, 0)
+    publish_session_list_changed("attention_resolved")
     count = 0
     for entry in entries:
         entry.result = response
@@ -218,6 +229,9 @@ def resolve_clarify_by_id(session_key: str, clarify_id: str, response: str) -> b
                 else:
                     _clear_queue_locked(session_key)
                     _clarify_sse_notify(session_key, None, 0)
+                # Safe to call while holding _lock: publish() only takes the
+                # leaf _SESSION_EVENTS_LOCK and never re-acquires this lock.
+                publish_session_list_changed("attention_resolved")
                 entry.result = response
                 entry.event.set()
                 return True
diff --git a/api/routes.py b/api/routes.py
index fd2196475f..66d237f772 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -2924,6 +2924,7 @@ def submit_pending(session_key: str, approval: dict) -> None:
         # submit_pending calls can't deliver out-of-order (T2's later
         # notify arriving before T1's earlier notify with a stale count).
         _approval_sse_notify_locked(session_key, head, total)
+    publish_session_list_changed("attention_pending")
     # NOTE: We do NOT call _submit_pending_raw here — that function overwrites
     # _pending[session_key] with a single dict, which would undo the list we just
     # built. The gateway blocking path uses _gateway_queues (a separate mechanism
@@ -11099,7 +11100,10 @@ def _resolve_approval_legacy(sid: str, approval_id: str, choice: str) -> bool:
         gateway_resolved = resolve_gateway_approval(sid, choice, resolve_all=False) or 0
     # Keep the historical no-id response path truthy for old clients/tests while
     # making stale explicit ids bounded as not-active for Slice 3b.
-    return bool(pending) or bool(gateway_resolved) or not bool(approval_id)
+    resolved = bool(pending) or bool(gateway_resolved) or not bool(approval_id)
+    if resolved:
+        publish_session_list_changed("attention_resolved")
+    return resolved
 
 
 def _handle_approval_respond(handler, body):
diff --git a/static/messages.js b/static/messages.js
index d9209cceae..01f7d9efbe 100644
--- a/static/messages.js
+++ b/static/messages.js
@@ -1706,14 +1706,14 @@ function attachLiveStream(activeSid, streamId, uploaded=[], options={}){
     source.addEventListener('approval',e=>{
       const d=JSON.parse(e.data);
       showApprovalForSession(activeSid, d, 1);
-      playNotificationSound();
+      playAttentionSound(_attentionSoundKey(activeSid,'approval',1));
       sendBrowserNotification('Approval required',d.description||'Tool approval needed');
     });
 
     source.addEventListener('clarify',e=>{
       const d=JSON.parse(e.data);
       showClarifyForSession(activeSid, d);
-      playNotificationSound();
+      playAttentionSound(_attentionSoundKey(activeSid,'clarify',1));
       sendBrowserNotification('Clarification needed',d.question||'Tool clarification needed');
     });
 
@@ -3332,6 +3332,43 @@ function playNotificationSound(){
   }catch(e){console.warn('Notification sound failed:',e);}
 }
 
+
+function _attentionSoundKey(sid,kind,count){
+  const safeSid=String(sid||'');
+  const safeKind=String(kind||'attention');
+  const safeCount=Math.max(1,Number(count)||1);
+  return `${safeSid}:${safeKind}:${safeCount}`;
+}
+
+function playAttentionSound(key){
+  if(!window._soundEnabled) return;
+  const nowMs=Date.now();
+  if(window._lastAttentionSoundAt&&nowMs-window._lastAttentionSoundAt<900) return;
+  const dedupeKey=key?String(key):'';
+  if(dedupeKey){
+    const seen=window._attentionSoundSeenKeys instanceof Map?window._attentionSoundSeenKeys:new Map();
+    window._attentionSoundSeenKeys=seen;
+    for(const [seenKey,seenAt] of seen){
+      if(nowMs-Number(seenAt||0)>300000) seen.delete(seenKey);
+    }
+    if(seen.has(dedupeKey)) return;
+    seen.set(dedupeKey,nowMs);
+  }
+  window._lastAttentionSoundAt=nowMs;
+  try{
+    const ctx=new (window.AudioContext||window.webkitAudioContext)();
+    const osc=ctx.createOscillator();
+    const gain=ctx.createGain();
+    osc.connect(gain);gain.connect(ctx.destination);
+    osc.type='sine';osc.frequency.setValueAtTime(880,ctx.currentTime);
+    osc.frequency.setValueAtTime(660,ctx.currentTime+0.075);
+    gain.gain.setValueAtTime(0.24,ctx.currentTime);
+    gain.gain.exponentialRampToValueAtTime(0.01,ctx.currentTime+0.24);
+    osc.start(ctx.currentTime);osc.stop(ctx.currentTime+0.24);
+    osc.onended=()=>ctx.close();
+  }catch(e){console.warn('Attention sound failed:',e);}
+}
+
 function sendBrowserNotification(title,body){
   if(!window._notificationsEnabled||!document.hidden) return;
   if(!('Notification' in window)) return;
diff --git a/static/sessions.js b/static/sessions.js
index e4a63e4223..a2aaf017e7 100644
--- a/static/sessions.js
+++ b/static/sessions.js
@@ -1607,6 +1607,8 @@ async function _ensureAllMessagesLoaded() {
 }
 
 let _allSessions = [];  // cached for search filter
+let _sessionAttentionSoundPrimed = false;
+const _sessionAttentionSoundState = new Map();
 let _renamingSid = null;  // session_id currently being renamed (blocks list re-renders)
 let _showArchived = false;  // toggle to show archived sessions
 let _sessionSelectMode = false;  // batch select mode
@@ -2361,6 +2363,42 @@ function _schedulePendingSessionListApply(){
   }, Math.max(120, SESSION_LIST_INTERACTION_IDLE_MS));
 }
 
+
+function _sessionAttentionSoundSignature(s){
+  const attention=s&&s.attention&&typeof s.attention==='object'?s.attention:null;
+  const count=Number(attention&&attention.count);
+  if(!attention||!attention.kind||!Number.isFinite(count)||count<=0)return null;
+  const kind=String(attention.kind)==='approval'?'approval':(String(attention.kind)==='clarify'?'clarify':'attention');
+  return `${kind}:${Math.max(1,count||1)}`;
+}
+
+function _syncSessionAttentionSoundState(sessions){
+  const next=new Map();
+  for(const s of Array.isArray(sessions)?sessions:[]){
+    if(!s||!s.session_id)continue;
+    const sig=_sessionAttentionSoundSignature(s);
+    if(sig) next.set(s.session_id,sig);
+  }
+  if(!_sessionAttentionSoundPrimed){
+    _sessionAttentionSoundPrimed=true;
+    _sessionAttentionSoundState.clear();
+    next.forEach((sig,sid)=>_sessionAttentionSoundState.set(sid,sig));
+    return;
+  }
+  next.forEach((sig,sid)=>{
+    const prev=_sessionAttentionSoundState.get(sid);
+    if(prev!==sig){
+      const [kind,countRaw]=String(sig).split(':');
+      const count=Number(countRaw)||1;
+      const s=(Array.isArray(sessions)?sessions:[]).find(item=>item&&item.session_id===sid)||{session_id:sid};
+      const playKey=typeof _attentionSoundKey==='function'?_attentionSoundKey(s.session_id,kind,count):`${s.session_id}:${sig}`;
+      if(playKey&&typeof playAttentionSound==='function') playAttentionSound(playKey);
+    }
+  });
+  _sessionAttentionSoundState.clear();
+  next.forEach((sig,sid)=>_sessionAttentionSoundState.set(sid,sig));
+}
+
 function _applySessionListPayload(sessData, projData){
   // Server's other_profile_count tells us how many sessions exist outside the
   // active profile so the "Show N from other profiles" toggle can render
@@ -2381,6 +2419,7 @@ function _applySessionListPayload(sessData, projData){
     : (sessData.sessions||[]);
   _reconcileActiveSessionIdleStateFromList(serverSessions);
   _allSessions = _mergeOptimisticFirstTurnSessions(serverSessions);
+  _syncSessionAttentionSoundState(_allSessions);
   _clearLineageReportCache();
   _allProjects = projData.projects||[];
   _markPollingCompletionUnreadTransitions(_allSessions);
diff --git a/tests/test_1694_terminal_cleanup_ownership.py b/tests/test_1694_terminal_cleanup_ownership.py
index 1390d9fc45..2993c473e8 100644
--- a/tests/test_1694_terminal_cleanup_ownership.py
+++ b/tests/test_1694_terminal_cleanup_ownership.py
@@ -137,6 +137,31 @@ def test_done_handler_is_idempotent_for_replay_or_duplicate_done_events():
     )
 
 
+def test_attention_events_use_distinct_sound_from_completion():
+    approval_body = _event_body("approval")
+    clarify_body = _event_body("clarify")
+    done_body = _event_body("done")
+    attention_body = _function_body("playAttentionSound")
+
+    assert "playAttentionSound(_attentionSoundKey(activeSid,'approval',1));" in approval_body
+    assert "playAttentionSound(_attentionSoundKey(activeSid,'clarify',1));" in clarify_body
+    for body in (approval_body, clarify_body):
+        assert "playNotificationSound();" not in body
+    assert "playNotificationSound();" in done_body
+    assert "playAttentionSound();" not in done_body
+    assert "osc.type='sine'" in attention_body
+    assert "window._lastAttentionSoundAt" in attention_body
+    assert "nowMs-window._lastAttentionSoundAt<900" in attention_body
+    assert "window._attentionSoundSeenKeys" in attention_body
+    assert "seen.has(dedupeKey)" in attention_body
+    assert "seen.set(dedupeKey,nowMs)" in attention_body
+    assert "osc.frequency.setValueAtTime(880,ctx.currentTime);" in attention_body
+    assert "osc.frequency.setValueAtTime(660,ctx.currentTime+0.075);" in attention_body
+    assert "gain.gain.setValueAtTime(0.24,ctx.currentTime);" in attention_body
+    assert "osc.stop(ctx.currentTime+0.24);" in attention_body
+    assert "Notification sound failed" not in attention_body
+
+
 def test_attach_live_stream_registers_one_source_per_session_stream():
     """Reconnect/compaction paths must not stack same-stream EventSources.
 
diff --git a/tests/test_attention_session_events.py b/tests/test_attention_session_events.py
new file mode 100644
index 0000000000..66dfed4f94
--- /dev/null
+++ b/tests/test_attention_session_events.py
@@ -0,0 +1,68 @@
+"""Attention badges must refresh the session sidebar immediately.
+
+Approval/clarify queues already notify the per-session card SSE stream.  The
+sidebar, however, listens to the global session-events stream and then reloads
+``/api/sessions``.  Without publishing on queue transitions, the badge and
+attention sound only appear after the user opens the affected thread.
+"""
+
+
+def test_clarify_pending_and_resolved_publish_session_list_changed(monkeypatch):
+    import api.clarify as clarify
+
+    events = []
+    monkeypatch.setattr(
+        clarify,
+        "publish_session_list_changed",
+        lambda reason: events.append(reason),
+    )
+    sid = "test-attention-clarify"
+
+    with clarify._lock:
+        clarify._pending.pop(sid, None)
+        clarify._gateway_queues.pop(sid, None)
+        clarify._gateway_notify_cbs.pop(sid, None)
+
+    try:
+        entry = clarify.submit_pending(sid, {"question": "Need input?"})
+        assert events == ["attention_pending"]
+        pending = clarify.get_pending(sid)
+        assert pending is not None
+        assert pending["clarify_id"] == entry.clarify_id
+
+        assert clarify.resolve_clarify_by_id(sid, entry.clarify_id, "yes") is True
+        assert events == ["attention_pending", "attention_resolved"]
+        assert clarify.get_pending(sid) is None
+    finally:
+        with clarify._lock:
+            clarify._pending.pop(sid, None)
+            clarify._gateway_queues.pop(sid, None)
+            clarify._gateway_notify_cbs.pop(sid, None)
+
+
+def test_approval_pending_and_resolved_publish_session_list_changed(monkeypatch):
+    import api.routes as routes
+
+    events = []
+    monkeypatch.setattr(
+        routes,
+        "publish_session_list_changed",
+        lambda reason: events.append(reason),
+    )
+    sid = "test-attention-approval"
+
+    with routes._lock:
+        routes._pending.pop(sid, None)
+        routes._gateway_queues.pop(sid, None)
+
+    try:
+        routes.submit_pending(sid, {"command": "echo ok", "pattern_key": "test-key"})
+        assert events == ["attention_pending"]
+
+        ok = routes._resolve_approval_legacy(sid, "", "deny")
+        assert ok is True
+        assert events == ["attention_pending", "attention_resolved"]
+    finally:
+        with routes._lock:
+            routes._pending.pop(sid, None)
+            routes._gateway_queues.pop(sid, None)
diff --git a/tests/test_session_attention_sound.py b/tests/test_session_attention_sound.py
new file mode 100644
index 0000000000..9f5955203b
--- /dev/null
+++ b/tests/test_session_attention_sound.py
@@ -0,0 +1,81 @@
+"""Regression tests for attention sounds on session attention state.
+
+Approval/clarify prompts can surface through the sidebar session metadata rather
+than the active live SSE stream. The sidebar badge path must play the distinct
+attention sound when a session newly needs user input, without blasting sounds
+for already-existing badges on initial load.
+"""
+from pathlib import Path
+
+REPO = Path(__file__).parent.parent
+SESSIONS_JS = (REPO / "static" / "sessions.js").read_text(encoding="utf-8")
+MESSAGES_JS = (REPO / "static" / "messages.js").read_text(encoding="utf-8")
+
+
+def _body_from_brace(src: str, brace: int, label: str) -> str:
+    assert brace >= 0, f"body opening brace not found for: {label}"
+    depth = 1
+    i = brace + 1
+    while i < len(src) and depth:
+        ch = src[i]
+        if ch == "{":
+            depth += 1
+        elif ch == "}":
+            depth -= 1
+        i += 1
+    assert depth == 0, f"body did not close for: {label}"
+    return src[brace + 1 : i - 1]
+
+
+def _function_body(src: str, name: str) -> str:
+    marker = f"function {name}("
+    start = src.find(marker)
+    assert start >= 0, f"function not found: {name}"
+    signature_end = src.find("){", start)
+    assert signature_end >= 0, f"function body not found: {name}"
+    return _body_from_brace(src, signature_end + 1, name)
+
+
+def test_sidebar_attention_state_plays_distinct_sound_on_new_attention_only():
+    sync_body = _function_body(SESSIONS_JS, "_syncSessionAttentionSoundState")
+    apply_body = _function_body(SESSIONS_JS, "_applySessionListPayload")
+
+    assert "let _sessionAttentionSoundPrimed = false;" in SESSIONS_JS
+    assert "const _sessionAttentionSoundState = new Map();" in SESSIONS_JS
+    assert "_syncSessionAttentionSoundState(_allSessions);" in apply_body
+    assert "if(!_sessionAttentionSoundPrimed)" in sync_body
+    assert "_sessionAttentionSoundPrimed=true;" in sync_body
+    assert "playKey=typeof _attentionSoundKey==='function'?_attentionSoundKey(s.session_id,kind,count):`${s.session_id}:${sig}`;" in sync_body
+    assert "if(playKey&&typeof playAttentionSound==='function') playAttentionSound(playKey);" in sync_body
+    assert "playNotificationSound" not in sync_body
+
+
+def test_attention_signature_tracks_kind_and_count_for_badge_changes():
+    signature_body = _function_body(SESSIONS_JS, "_sessionAttentionSoundSignature")
+
+    assert "attention.kind" in signature_body
+    assert "Number.isFinite(count)" in signature_body
+    assert "count<=0" in signature_body
+    assert "approval" in signature_body
+    assert "clarify" in signature_body
+    assert "return `${kind}:${Math.max(1,count||1)}`;" in signature_body
+
+
+def test_attention_sound_is_softer_short_reverse_of_completion_sound():
+    attention_body = _function_body(MESSAGES_JS, "playAttentionSound")
+    completion_body = _function_body(MESSAGES_JS, "playNotificationSound")
+
+    assert "osc.type='sine'" in attention_body
+    assert "window._lastAttentionSoundAt" in attention_body
+    assert "nowMs-window._lastAttentionSoundAt<900" in attention_body
+    assert "window._attentionSoundSeenKeys" in attention_body
+    assert "seen.has(dedupeKey)" in attention_body
+    assert "seen.set(dedupeKey,nowMs)" in attention_body
+    assert "300000" in attention_body
+    assert "osc.frequency.setValueAtTime(880,ctx.currentTime);" in attention_body
+    assert "osc.frequency.setValueAtTime(660,ctx.currentTime+0.075);" in attention_body
+    assert "gain.gain.setValueAtTime(0.24,ctx.currentTime);" in attention_body
+    assert "osc.stop(ctx.currentTime+0.24);" in attention_body
+    assert "osc.frequency.setValueAtTime(660,ctx.currentTime);" in completion_body
+    assert "osc.frequency.setValueAtTime(880,ctx.currentTime+0.1);" in completion_body
+    assert "osc.stop(ctx.currentTime+0.3);" in completion_body

From 01c1239fc9fa1507f526c3cf7a7d24afd42664f7 Mon Sep 17 00:00:00 2001
From: Hermes Agent 
Date: Sat, 30 May 2026 19:54:51 +0000
Subject: [PATCH 307/349] refactor(sessions): simplify attention indicator to a
 color-coded dot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Per maintainer UX direction: drop the text badge pill ("APPROVAL" /
"N QUESTIONS") in favor of color-coding the existing right-side status dot
plus the colored left rail. Red dot (--error) for pending approvals, amber
dot (--warning) for pending clarifies; theme-driven, visible even when the
session is not streaming/unread. Approval dot gently pulses (disabled under
prefers-reduced-motion). Quieter and consistent with the existing pin/unread
dot family — the row no longer needs to truncate its title to fit a pill.

Updated test_session_attention_badges to assert the dot classes
(is-attention-approval/clarify) instead of the removed badge element/styles.

Co-authored-by: ai-ag2026 <261867348+ai-ag2026@users.noreply.github.com>
---
 static/sessions.js                     | 11 +++--------
 static/style.css                       | 26 +++++++++++++++++++++-----
 tests/test_session_attention_badges.py | 11 +++++++++--
 3 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/static/sessions.js b/static/sessions.js
index a2aaf017e7..aadf84e8b5 100644
--- a/static/sessions.js
+++ b/static/sessions.js
@@ -3984,13 +3984,6 @@ function renderSessionListFromCache(){
       };
       titleRow.appendChild(childCountEl);
     }
-    if(attention){
-      const attentionEl=document.createElement('span');
-      attentionEl.className='session-attention-badge session-attention-badge-'+attention.kind;
-      attentionEl.textContent=attention.label;
-      attentionEl.title=attention.title;
-      titleRow.appendChild(attentionEl);
-    }
     titleRow.appendChild(ts);
     sessionText.appendChild(titleRow);
     if(density==='detailed'){
@@ -4165,7 +4158,9 @@ function renderSessionListFromCache(){
     // sits outside the truncating title span and stays visible.)
     el.appendChild(sessionText);
     const state=document.createElement('span');
-    state.className='session-attention-indicator session-state-indicator'+(isStreaming?' is-streaming':(hasUnread?' is-unread':''));
+    const attentionDotClass=attention?(attention.kind==='approval'?' is-attention-approval':(attention.kind==='clarify'?' is-attention-clarify':' is-attention-generic')):'';
+    state.className='session-attention-indicator session-state-indicator'+(isStreaming?' is-streaming':(hasUnread?' is-unread':''))+attentionDotClass;
+    if(attention&&attention.title) state.title=attention.title;
     state.setAttribute('aria-hidden','true');
     el.appendChild(state);
     // Single trigger button that opens a shared dropdown menu
diff --git a/static/style.css b/static/style.css
index 982833fbec..d755b4353c 100644
--- a/static/style.css
+++ b/static/style.css
@@ -940,14 +940,29 @@
   .session-item.active .session-search-preview{color:var(--accent-text);opacity:.72;}
   .session-item.active .session-search-hit{background:var(--accent-bg-strong);color:var(--accent-text);}
   .session-item.active .session-meta{color:var(--accent-text);opacity:.8;}
-  .session-attention-badge{display:inline-flex;align-items:center;justify-content:center;flex-shrink:0;max-width:92px;padding:2px 6px;border-radius:999px;font-size:9px;font-weight:800;line-height:1.2;letter-spacing:.04em;text-transform:uppercase;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:var(--bg);background:var(--warning);box-shadow:0 0 0 1px color-mix(in srgb,var(--warning) 38%,transparent);}
-  .session-attention-badge-approval{background:var(--error);color:#fff;box-shadow:0 0 0 1px color-mix(in srgb,var(--error) 42%,transparent);animation:sessionAttentionPulse 1.6s ease-in-out infinite;}
-  .session-attention-badge-clarify{background:var(--warning);color:var(--bg);}
-  .session-item.active .session-attention-badge{box-shadow:0 0 0 1px color-mix(in srgb,currentColor 35%,transparent);}
+  /* Attention dot variants — see the attention-dot block below the base
+     .session-state-indicator rule. */
   .session-state-indicator{display:inline-flex;align-items:center;justify-content:center;flex-shrink:0;width:10px;height:10px;color:var(--accent);visibility:hidden;}
   .session-attention-indicator{position:absolute;right:6px;top:50%;transform:translateY(-50%);width:26px;height:26px;z-index:1;pointer-events:none;transition:opacity .15s ease,visibility .15s ease;}
   .session-item:hover .session-attention-indicator,.session-item:focus-within .session-attention-indicator,.session-item.menu-open .session-attention-indicator{opacity:0;visibility:hidden;}
   .session-state-indicator.is-streaming,.session-state-indicator.is-unread{visibility:visible;}
+  /* Attention state dot: NO text badge — the right-side status dot itself
+     carries the attention color (red=approval, amber/warning=clarify), and the
+     row keeps its colored left rail + tinted background. Visible even when the
+     session is not streaming/unread. Theme-driven via --error / --warning. */
+  .session-state-indicator.is-attention-approval,
+  .session-state-indicator.is-attention-clarify,
+  .session-state-indicator.is-attention-generic{visibility:visible;}
+  .session-state-indicator.is-attention-approval{color:var(--error);}
+  .session-state-indicator.is-attention-clarify,
+  .session-state-indicator.is-attention-generic{color:var(--warning);}
+  .session-state-indicator.is-attention-approval:not(.is-streaming):not(.is-unread)::before,
+  .session-state-indicator.is-attention-clarify:not(.is-streaming):not(.is-unread)::before,
+  .session-state-indicator.is-attention-generic:not(.is-streaming):not(.is-unread)::before{
+    content:"";display:block;width:8px;height:8px;border-radius:50%;background:currentColor;
+  }
+  /* Approval is the more urgent state — gently pulse its dot. */
+  .session-state-indicator.is-attention-approval:not(.is-streaming):not(.is-unread)::before{animation:sessionAttentionPulse 1.6s ease-in-out infinite;}
   .session-state-indicator::before{content:"";display:block;flex-shrink:0;}
   .session-state-indicator.is-streaming::before{
     width:100%;
@@ -1011,7 +1026,8 @@
     .session-action-menu{animation:none;will-change:auto;}
     .session-item,.session-item.dragging,.session-item.session-reflowing,.session-item.swipe-committed,.session-item.swipe-removing{transition:none;}
     .session-item.long-pressing,.session-item.session-swipe-returning{animation:none;}
-    .session-item.session-list-flip-enter,.session-attention-badge-approval{animation:none;}
+    .session-item.session-list-flip-enter{animation:none;}
+    .session-state-indicator.is-attention-approval:not(.is-streaming):not(.is-unread)::before{animation:none;}
   }
   /* Hide overlay during inline rename */
   .session-item:has(.session-title-input) .session-actions{display:none;}
diff --git a/tests/test_session_attention_badges.py b/tests/test_session_attention_badges.py
index 372e23a9e5..a2c75272cc 100644
--- a/tests/test_session_attention_badges.py
+++ b/tests/test_session_attention_badges.py
@@ -127,7 +127,11 @@ def test_session_sidebar_renders_attention_badge_and_semantic_classes():
     assert "needs-attention" in sessions_js
     assert "attention-approval" in sessions_js
     assert "attention-clarify" in sessions_js
-    assert "session-attention-badge" in sessions_js
+    # Attention is conveyed by the colored status dot (is-attention-*), not a
+    # text badge — the badge was removed in favor of a color-coded dot + rail.
+    assert "is-attention-approval" in sessions_js
+    assert "is-attention-clarify" in sessions_js
+    assert "session-attention-badge" not in sessions_js
     assert "session_attention_approval" in sessions_js
     assert "session_attention_clarify" in sessions_js
     assert "s.attention" in sessions_js
@@ -142,5 +146,8 @@ def test_session_sidebar_renders_attention_badge_and_semantic_classes():
     assert ".session-item.needs-attention" in style_css
     assert ".session-item.attention-approval" in style_css
     assert ".session-item.attention-clarify" in style_css
-    assert ".session-attention-badge" in style_css
+    # The text-badge styles were removed; the dot now carries the color.
+    assert ".session-attention-badge" not in style_css
+    assert ".session-state-indicator.is-attention-approval" in style_css
+    assert ".session-state-indicator.is-attention-clarify" in style_css
     assert "prefers-reduced-motion" in style_css

From f4772ff0815ed9338c59fc5d9be5f55d2b6993d2 Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sat, 30 May 2026 20:09:56 +0000
Subject: [PATCH 308/349] ci(docker): cache smoke-test image layers via GHA
 cache (#3197 docker half)

Build the Docker image once in a build-image job, cache layers via type=gha,
restore from cache in each smoke variant instead of rebuilding. Variant restore
uses cache-from only (build-image is the sole cache writer).

Co-authored-by: hayriodabas 
---
 .github/workflows/docker-smoke.yml | 45 +++++++++++++++++++++++-------
 CHANGELOG.md                       |  6 ++++
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker-smoke.yml b/.github/workflows/docker-smoke.yml
index 66de8488e8..f596aea715 100644
--- a/.github/workflows/docker-smoke.yml
+++ b/.github/workflows/docker-smoke.yml
@@ -66,10 +66,31 @@ jobs:
             echo "::endgroup::"
           done
 
+  # Build the Docker image once and cache layers via GHA cache.
+  # The smoke matrix jobs then pull from this cache instead of rebuilding
+  # from scratch, saving ~1-3 minutes per variant.
+  build-image:
+    name: Build Docker image (cache layers)
+    runs-on: ubuntu-latest
+    needs: compose-config
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: docker/setup-buildx-action@v3
+
+      - name: Build and cache Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          load: true
+          tags: ghcr.io/nesquena/hermes-webui:latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
   smoke:
     name: Smoke ${{ matrix.variant }}
     runs-on: ubuntu-latest
-    needs: compose-config
+    needs: [compose-config, build-image]
     timeout-minutes: 15
     strategy:
       fail-fast: false
@@ -81,6 +102,19 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - uses: docker/setup-buildx-action@v3
+
+      # Restore the cached Docker image from the build-image job.
+      # Read-only: the build-image job already populated the GHA cache, so the
+      # smoke variants only need cache-from (no redundant cache-to re-export).
+      - name: Restore Docker image from cache
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          load: true
+          tags: ghcr.io/nesquena/hermes-webui:latest
+          cache-from: type=gha
+
       - name: Resolve compose file + project name
         id: vars
         run: |
@@ -119,15 +153,6 @@ jobs:
             docker network rm "$n" || true
           done
 
-      - name: Build local Dockerfile
-        # We always build the local Dockerfile so the PR's changes are tested,
-        # even on the multi-container variants whose compose files reference
-        # ghcr.io/nesquena/hermes-webui:latest. Without this retag, multi-container
-        # smoke runs would test the previous release, not the PR.
-        run: |
-          set -euo pipefail
-          docker build -t ghcr.io/nesquena/hermes-webui:latest .
-
       - name: Prepare ephemeral host paths
         id: paths
         run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bd5089c6c..4c8a77f8f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@
 
 ## [Unreleased]
 
+## [v0.51.177] — 2026-05-30 — Release EW (stage-batch59 — Docker smoke-test layer caching)
+
+### Changed
+
+- CI: the Docker smoke-test workflow now builds the image once and caches its layers via the GitHub Actions cache (`type=gha`), then each compose variant restores from that cache instead of rebuilding from scratch — saving ~1-3 minutes per variant. The image is still built from the PR's local Dockerfile (`load: true`), so PR changes are tested, not the released image. (Partial adoption of #3197 — the Docker half; the test-sharding half is deferred pending test-suite shard-safety work.)
+
 ## [v0.51.176] — 2026-05-30 — Release EV (stage-batch58 — sidebar attention indicators)
 
 ### Added

From f9acf464e9a5d60dacbe79a4bcda2944f6670bb6 Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sat, 30 May 2026 21:09:25 +0000
Subject: [PATCH 309/349] ci: run test suite in 3 parallel shards + make suite
 shard-safe
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Completes the test-sharding half of #3197 (Docker-cache half shipped v0.51.177).
Adds pytest-shard 3-way split to tests.yml (3 shards x 3 Python = 9 jobs,
fail-fast: false). pytest-shard is 0-indexed so the matrix uses [0,1,2] — the
original #3197 used [1,2,3] which would have crashed the out-of-range job and
silently skipped shard 0's tests.

Made the suite shard-safe by fixing 4 cross-test state-pollution bugs that
passed sequentially but failed when sharded:
- test_onboarding_mvp: reset onboarding_completed flag (settings.json) in the
  autouse fixture; the config-cleanup only cleared config.yaml/.env.
- test_issue693_system_health_panel: invalidate the process-wide password-hash
  cache before/after so a prior test's "no password" cache doesn't defeat the
  auth-gate assertion.
- test_auth_session_persistence: assert against auth._SESSIONS_FILE (where auth
  actually writes) instead of a local _TEST_STATE path that only matched under a
  lucky import order.
- test_profile_env_isolation (root cause of the worst leak): stop deleting +
  re-importing api.profiles under a temp HERMES_BASE_HOME — that swapped the
  module object and poisoned the cached _DEFAULT_HERMES_HOME for every later
  test (broke test_title_aux_routing's load_config). Now points the cached path
  via monkeypatch.setattr (auto-restored, no module swap).
- conftest: autouse fixture restores HERMES_HOME/HERMES_BASE_HOME after each
  test as defense-in-depth against future switch_profile leaks.

Verified: all 3 shards green (6912 passed, 0 failed); full sequential run still
green (6957 passed, 0 failed). Slowest shard ~70s vs ~180s sequential.
---
 .github/workflows/tests.yml                | 22 ++++++++--
 CHANGELOG.md                               |  6 +++
 tests/conftest.py                          | 49 ++++++++++++++++++++++
 tests/test_auth_session_persistence.py     |  6 ++-
 tests/test_issue693_system_health_panel.py | 16 ++++++-
 tests/test_onboarding_mvp.py               |  7 ++++
 tests/test_profile_env_isolation.py        | 20 +++++----
 7 files changed, 112 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2248ffa3b1..d0de40035b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -10,8 +10,19 @@ jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
+      # Don't cancel the other shards/versions when one fails — we want the full
+      # failure picture across the matrix in a single run.
+      fail-fast: false
       matrix:
         python-version: ['3.11', '3.12', '3.13']
+        # Split the suite across 3 parallel shards per Python version. pytest-shard
+        # partitions tests deterministically by test-id hash; the suite was made
+        # shard-safe (no cross-test state leakage) so every shard passes
+        # independently. See docs/agent-memory note on test-suite shard-safety.
+        # NOTE: pytest-shard is 0-indexed — shard ids must be 0..num_shards-1.
+        # Using 1-based ids would crash the out-of-range job AND silently skip
+        # shard 0's tests.
+        shard: [0, 1, 2]
 
     steps:
       - uses: actions/checkout@v4
@@ -20,11 +31,16 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+          cache-dependency-path: |
+            **/setup.cfg
+            **/requirements*.txt
+            **/pyproject.toml
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install "pyyaml>=6.0" pytest pytest-timeout pytest-asyncio
+          pip install "pyyaml>=6.0" pytest pytest-timeout pytest-asyncio pytest-shard
           # Install the `mcp` package so tests/test_mcp_server.py runs in CI.
           # The package is an optional runtime dep of mcp_server.py — users
           # who run the MCP integration install it themselves; CI installs
@@ -33,5 +49,5 @@ jobs:
           # importorskip and the matrix stays green.
           pip install mcp || echo "mcp install failed — test_mcp_server.py will importorskip"
 
-      - name: Run tests
-        run: pytest tests/ -v --timeout=60
+      - name: Run tests (shard ${{ matrix.shard }} of 3)
+        run: pytest tests/ -v --timeout=60 --shard-id=${{ matrix.shard }} --num-shards=3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c8a77f8f1..b0a60bb12e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@
 
 ## [Unreleased]
 
+## [v0.51.178] — 2026-05-30 — Release EX (stage-batch60 — parallel sharded CI test runs)
+
+### Changed
+
+- CI: the test suite now runs in 3 parallel shards per Python version (9 jobs total) via `pytest-shard`, cutting wall-clock test time roughly in half (slowest shard ~70s vs ~180s sequential). To make sharding safe, several tests that asserted a pristine default while a sibling test mutated shared process/server state were fixed to establish their own preconditions: onboarding-completed flag reset (`test_onboarding_mvp`), password-hash cache invalidation (`test_issue693_system_health_panel`), authoritative sessions-file path (`test_auth_session_persistence`), and — the root cause of the worst leak — `test_profile_env_isolation` no longer deletes + re-imports `api.profiles` (which poisoned the module's cached base-home global for every later test); it now points the cached path via `monkeypatch.setattr`. A conftest fixture also restores `HERMES_HOME`/`HERMES_BASE_HOME` after each test as defense-in-depth. Completes the test-sharding half of #3197 (the Docker-cache half shipped in v0.51.177).
+
 ## [v0.51.177] — 2026-05-30 — Release EW (stage-batch59 — Docker smoke-test layer caching)
 
 ### Changed
diff --git a/tests/conftest.py b/tests/conftest.py
index 57ca4ba9b6..43c91a6188 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -18,6 +18,7 @@
 import pathlib
 import shutil
 import subprocess
+import sys
 import time
 import urllib.request
 import urllib.error
@@ -83,6 +84,54 @@ def _isolate_hermes_config_path():
     yield
     os.environ['HERMES_CONFIG_PATH'] = isolated_config_path
 
+
+@pytest.fixture(autouse=True)
+def _restore_profile_home_globals():
+    """Restore HERMES_HOME / HERMES_BASE_HOME after every test.
+
+    Several tests call ``api.profiles.switch_profile()`` (or set HERMES_HOME
+    directly) which mutates ``os.environ['HERMES_HOME']`` IN PLACE — not via
+    monkeypatch — so the change is not auto-reverted at test teardown. In the
+    normal sequential run the next test usually re-establishes its own profile so
+    the leak is masked, but under pytest-shard (or pytest-randomly) the leaked
+    HERMES_HOME points at a deleted tmpdir and breaks any later test whose
+    config/profile resolution reads it (e.g. test_title_aux_routing's
+    background-worker profile routing, which then falls back to DEFAULT_CONFIG
+    where ``model`` is an empty string). Snapshotting at the conftest level fixes
+    the whole class at once, regardless of which test does the leaking.
+    """
+    saved_home = os.environ.get('HERMES_HOME')
+    saved_base = os.environ.get('HERMES_BASE_HOME')
+    # Re-derive the cached base-home global BEFORE the test runs too: a prior
+    # test's teardown ordering (monkeypatch restoring sys.modules['api.profiles']
+    # after this fixture's teardown) can leave the live module's
+    # _DEFAULT_HERMES_HOME stale. Fixing it at setup time guarantees each test
+    # starts from a base root that matches the current (restored) env.
+    _rederive_default_hermes_home()
+    yield
+    for key, val in (('HERMES_HOME', saved_home), ('HERMES_BASE_HOME', saved_base)):
+        if val is None:
+            os.environ.pop(key, None)
+        else:
+            os.environ[key] = val
+    _rederive_default_hermes_home()
+
+
+def _rederive_default_hermes_home():
+    """Recompute api.profiles._DEFAULT_HERMES_HOME from the current env.
+
+    api.profiles caches the base home at import time. A test that re-imports
+    api.profiles under a temporary HERMES_BASE_HOME (e.g. test_profile_env_isolation)
+    corrupts that global to a now-deleted tmpdir, making get_hermes_home_for_profile
+    resolve later tests' profiles under the dead path. Re-deriving keeps it honest.
+    """
+    prof_mod = sys.modules.get('api.profiles')
+    if prof_mod is not None and hasattr(prof_mod, '_resolve_base_hermes_home'):
+        try:
+            prof_mod._DEFAULT_HERMES_HOME = prof_mod._resolve_base_hermes_home()
+        except Exception:
+            pass
+
 # ── Server script: always relative to repo root ───────────────────────────
 SERVER_SCRIPT = REPO_ROOT / 'server.py'
 if not SERVER_SCRIPT.exists():
diff --git a/tests/test_auth_session_persistence.py b/tests/test_auth_session_persistence.py
index 84b796f57a..a544046616 100644
--- a/tests/test_auth_session_persistence.py
+++ b/tests/test_auth_session_persistence.py
@@ -81,7 +81,11 @@ def test_expired_sessions_pruned_on_load(self) -> None:
     def test_sessions_file_permissions(self) -> None:
         """Sessions file must be owner-read-only (0600)."""
         auth.create_session()
-        sessions_file = _TEST_STATE / '.sessions.json'
+        # Check the path auth actually writes to (auth._SESSIONS_FILE is computed
+        # from api.config.STATE_DIR at import time). Asserting against a local
+        # _TEST_STATE assumption is fragile under sharded / reordered runs where
+        # this module may import before api.config.STATE_DIR resolves to _TEST_STATE.
+        sessions_file = auth._SESSIONS_FILE
         self.assertTrue(sessions_file.exists(), ".sessions.json was not created")
         mode = oct(sessions_file.stat().st_mode & 0o777)
         self.assertEqual(mode, oct(0o600),
diff --git a/tests/test_issue693_system_health_panel.py b/tests/test_issue693_system_health_panel.py
index 81b5843828..511aaa147f 100644
--- a/tests/test_issue693_system_health_panel.py
+++ b/tests/test_issue693_system_health_panel.py
@@ -108,11 +108,23 @@ def test_system_health_route_registered_and_auth_gated(monkeypatch):
     assert '"/api/system/health"' not in AUTH_PY, "system metrics must not be public"
 
     monkeypatch.setenv("HERMES_WEBUI_PASSWORD", "test-password")
+    from api import auth as _auth
     from api.auth import check_auth
 
+    # The password hash is cached process-wide (PBKDF2 is ~1s). A prior test may
+    # have populated the cache with "no password" (None), so the env var we just
+    # set would be ignored on the fast path. Invalidate before AND after so this
+    # test sees its own password and doesn't leak the test-password cache to the
+    # next test — required for order-independence under sharded/random runs.
+    _auth._invalidate_password_hash_cache()
+
     handler = _FakeHandler()
-    assert check_auth(handler, SimpleNamespace(path="/api/system/health", query="")) is False
-    assert handler.status in (302, 401)
+    try:
+        assert check_auth(handler, SimpleNamespace(path="/api/system/health", query="")) is False
+        assert handler.status in (302, 401)
+    finally:
+        monkeypatch.delenv("HERMES_WEBUI_PASSWORD", raising=False)
+        _auth._invalidate_password_hash_cache()
 
 
 def test_system_health_route_returns_only_sanitized_payload(monkeypatch):
diff --git a/tests/test_onboarding_mvp.py b/tests/test_onboarding_mvp.py
index 82ac6075d6..664fe22006 100644
--- a/tests/test_onboarding_mvp.py
+++ b/tests/test_onboarding_mvp.py
@@ -64,9 +64,16 @@ def clean_hermes_config_files():
     hermes_home = _server_hermes_home()
     for rel in ("config.yaml", ".env"):
         (hermes_home / rel).unlink(missing_ok=True)
+    # onboarding_completed lives in settings.json (not config.yaml/.env), so the
+    # unlinks above don't reset it. A prior test that completes onboarding would
+    # otherwise leak the flag and make tests asserting the pristine "incomplete"
+    # default fail under sharded/reordered runs. Reset it via the settings API
+    # (the source of truth the server reads) before AND after each test.
+    post("/api/settings", {"onboarding_completed": False})
     yield
     for rel in ("config.yaml", ".env"):
         (hermes_home / rel).unlink(missing_ok=True)
+    post("/api/settings", {"onboarding_completed": False})
 
 
 
diff --git a/tests/test_profile_env_isolation.py b/tests/test_profile_env_isolation.py
index 3b2faae61e..c73d41520c 100644
--- a/tests/test_profile_env_isolation.py
+++ b/tests/test_profile_env_isolation.py
@@ -18,10 +18,12 @@ def test_profile_switch_clears_previous_profile_env_vars(monkeypatch, tmp_path):
     monkeypatch.delenv("OPENAI_API_KEY", raising=False)
     monkeypatch.delenv("CUSTOM_TOKEN", raising=False)
 
-    # Use monkeypatch so sys.modules is restored after the test, preventing
-    # api.profiles from being permanently removed and poisoning subsequent tests.
-    monkeypatch.delitem(sys.modules, "api.profiles", raising=False)
-    profiles = importlib.import_module("api.profiles")
+    # Point the module's cached base-home at our temp base via monkeypatch
+    # (auto-restored at teardown) instead of deleting + re-importing api.profiles.
+    # The delitem+import_module approach swapped the module object and poisoned
+    # dependent modules' cached references, breaking later tests under sharding.
+    import api.profiles as profiles
+    monkeypatch.setattr(profiles, "_DEFAULT_HERMES_HOME", base)
 
     profiles.init_profile_state()
     profiles.switch_profile("p1")
@@ -53,10 +55,12 @@ def test_profile_switch_replaces_overlapping_keys(monkeypatch, tmp_path):
     monkeypatch.delenv("ONLY_P1", raising=False)
     monkeypatch.delenv("ONLY_P2", raising=False)
 
-    # Use monkeypatch so sys.modules is restored after the test, preventing
-    # api.profiles from being permanently removed and poisoning subsequent tests.
-    monkeypatch.delitem(sys.modules, "api.profiles", raising=False)
-    profiles = importlib.import_module("api.profiles")
+    # Point the module's cached base-home at our temp base via monkeypatch
+    # (auto-restored at teardown) instead of deleting + re-importing api.profiles.
+    # The delitem+import_module approach swapped the module object and poisoned
+    # dependent modules' cached references, breaking later tests under sharding.
+    import api.profiles as profiles
+    monkeypatch.setattr(profiles, "_DEFAULT_HERMES_HOME", base)
 
     profiles.init_profile_state()
     profiles.switch_profile("p1")

From cceeca89d0d387273f0fd8ceb20fca21299d761d Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sat, 30 May 2026 21:46:01 +0000
Subject: [PATCH 310/349] polish(#3203): keep localized attention tooltip
 precedence over generic state tooltip

The merged hunk set state.title=_sessionStateTooltip(...) unconditionally,
two lines after assigning the localized attention.title (pending approval/
clarify, from #3190). That clobbered the attention tooltip and, for a
needs-attention session not currently streaming, blanked it to '' since
_sessionStateTooltip returns '' when neither streaming nor unread.

Make the attention title win, and apply the state tooltip only when non-empty.
Adds a regression test pinning the precedence.

Co-authored-by: ai-ag2026 
---
 CHANGELOG.md                   |  2 +-
 static/sessions.js             | 10 ++++++++--
 tests/test_sidebar_tooltips.py | 24 +++++++++++++++++++++++-
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9fff014c7..8b9170d2e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@
 ### Fixed
 
 - Reasoning effort selector now appears for thinking-capable models served through custom API aggregators (New API, One API, etc.) that use non-standard model naming — bare names like `deepseek-v4-flash` or dot-separated `moonshotai.kimi-k2.5` rather than the OpenRouter-style `vendor/model` slash format. The heuristic now also strips a dot-vendor prefix and recognizes a `thinking`/`reasoning` token anywhere in the model name; plain non-reasoning models stay hidden as before (#3202).
-- Sidebar session row tooltips now explain the fork, prior-turn, child-session, and running/unread status badges, and hovering a truncated chat title shows the full title instead of the old "Double-click to rename" hint (#3203).
+- Sidebar session row tooltips now explain the fork, prior-turn, child-session, and running/unread status badges, and hovering a truncated chat title shows the full title instead of the old "Double-click to rename" hint (#3203). The localized pending-approval/clarify attention tooltip retains precedence over the generic running/unread state tooltip on the status dot.
 
 ## [v0.51.178] — 2026-05-30 — Release EX (stage-batch60 — parallel sharded CI test runs)
 
diff --git a/static/sessions.js b/static/sessions.js
index 2ead02c991..f737d1ab5c 100644
--- a/static/sessions.js
+++ b/static/sessions.js
@@ -4345,9 +4345,15 @@ function renderSessionListFromCache(){
     const state=document.createElement('span');
     const attentionDotClass=attention?(attention.kind==='approval'?' is-attention-approval':(attention.kind==='clarify'?' is-attention-clarify':' is-attention-generic')):'';
     state.className='session-attention-indicator session-state-indicator'+(isStreaming?' is-streaming':(hasUnread?' is-unread':''))+attentionDotClass;
-    if(attention&&attention.title) state.title=attention.title;
     state.setAttribute('aria-hidden','true');
-    state.title=_sessionStateTooltip({isStreaming,hasUnread});
+    // Tooltip precedence: a localized attention title (pending approval/clarify,
+    // from the attention-indicator feature) is more specific and actionable than
+    // the generic running/unread state tooltip, so it wins. Fall back to the state
+    // tooltip only when there is no attention title AND the state tooltip is
+    // non-empty — never blank an otherwise-meaningful tooltip.
+    const _stateTip=_sessionStateTooltip({isStreaming,hasUnread});
+    if(attention&&attention.title) state.title=attention.title;
+    else if(_stateTip) state.title=_stateTip;
     el.appendChild(state);
     // Single trigger button that opens a shared dropdown menu
     let actions=null;
diff --git a/tests/test_sidebar_tooltips.py b/tests/test_sidebar_tooltips.py
index a5be58913c..f6ad0aafa1 100644
--- a/tests/test_sidebar_tooltips.py
+++ b/tests/test_sidebar_tooltips.py
@@ -31,4 +31,26 @@ def test_sidebar_status_badges_have_explanatory_tooltips():
     assert "branchInd.title=_sessionForkTooltip(parentLabel);" in js
     assert "segmentCountEl.title=_sessionLineageBadgeTooltip(segmentLabel,canExpandLineageSegments);" in js
     assert "childCountEl.title=_sessionChildBadgeTooltip(childLabel);" in js
-    assert "state.title=_sessionStateTooltip({isStreaming,hasUnread});" in js
+    assert "_sessionStateTooltip({isStreaming,hasUnread})" in js
+
+
+def test_state_tooltip_does_not_clobber_attention_title():
+    """The generic running/unread state tooltip must NOT overwrite a more
+    specific, localized attention tooltip (pending approval/clarify).
+
+    Regression: the first cut of this feature set ``state.title`` to the
+    state tooltip *unconditionally*, two lines after assigning the localized
+    ``attention.title`` — which both clobbered the attention tooltip and, for a
+    needs-attention session that was not currently streaming, blanked it to ''
+    (``_sessionStateTooltip`` returns '' when neither streaming nor unread).
+    The attention title must take precedence, and the state tooltip must only
+    apply when it is non-empty.
+    """
+    js = _sessions_js()
+    # The attention title still wins.
+    assert "if(attention&&attention.title) state.title=attention.title;" in js
+    # The state tooltip is applied via an else-if guarded on non-empty, never
+    # as an unconditional assignment that could blank the attention title.
+    assert "else if(_stateTip) state.title=_stateTip;" in js
+    # The old unconditional-clobber line must be gone.
+    assert "state.title=_sessionStateTooltip({isStreaming,hasUnread});" not in js

From d6d74b535474d87acf5026f7803dbb033d817abb Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sat, 30 May 2026 21:51:17 +0000
Subject: [PATCH 311/349] polish(#3203): preserve localized 'Forked from' base
 in fork tooltip
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Opus advisor SHOULD-FIX: the tooltip rework dropped t('forked_from') in favor
of a hardcoded English string, a real i18n regression (the catalog key exists
in all locales). Restore the localized base while keeping the clearer
': ' format. Adds a regression test.

The new lineage/child explanatory suffixes (additive English) and the
read-only title hint are deferred to a small follow-up — they need new locale
keys and the read-only state is still surfaced by the existing meta chip.

Co-authored-by: ai-ag2026 
---
 CHANGELOG.md                   |  2 +-
 static/sessions.js             |  6 +++++-
 tests/test_sidebar_tooltips.py | 13 +++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b9170d2e8..8e71e0956a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@
 ### Fixed
 
 - Reasoning effort selector now appears for thinking-capable models served through custom API aggregators (New API, One API, etc.) that use non-standard model naming — bare names like `deepseek-v4-flash` or dot-separated `moonshotai.kimi-k2.5` rather than the OpenRouter-style `vendor/model` slash format. The heuristic now also strips a dot-vendor prefix and recognizes a `thinking`/`reasoning` token anywhere in the model name; plain non-reasoning models stay hidden as before (#3202).
-- Sidebar session row tooltips now explain the fork, prior-turn, child-session, and running/unread status badges, and hovering a truncated chat title shows the full title instead of the old "Double-click to rename" hint (#3203). The localized pending-approval/clarify attention tooltip retains precedence over the generic running/unread state tooltip on the status dot.
+- Sidebar session row tooltips now explain the fork, prior-turn, child-session, and running/unread status badges, and hovering a truncated chat title shows the full title instead of the old "Double-click to rename" hint (#3203). The localized pending-approval/clarify attention tooltip retains precedence over the generic running/unread state tooltip on the status dot, and the fork tooltip keeps its localized "Forked from" base.
 
 ## [v0.51.178] — 2026-05-30 — Release EX (stage-batch60 — parallel sharded CI test runs)
 
diff --git a/static/sessions.js b/static/sessions.js
index f737d1ab5c..8f397fc490 100644
--- a/static/sessions.js
+++ b/static/sessions.js
@@ -3348,7 +3348,11 @@ function _sessionFullTitleTooltip(rawTitle, cleanTitle){
 
 function _sessionForkTooltip(parentLabel){
   const parent=String(parentLabel||'').trim()||'unknown parent';
-  return `Forked conversation — parent: ${parent}`;
+  // Preserve the localized "Forked from" base (the catalog key exists in all
+  // locales) rather than hardcoding English — the only regression risk in the
+  // tooltip rework was dropping t('forked_from') here.
+  const prefix=(typeof t==='function'?t('forked_from'):'Forked from');
+  return `${prefix}: ${parent}`;
 }
 
 function _sessionLineageBadgeTooltip(label, canExpand){
diff --git a/tests/test_sidebar_tooltips.py b/tests/test_sidebar_tooltips.py
index f6ad0aafa1..6bfc897827 100644
--- a/tests/test_sidebar_tooltips.py
+++ b/tests/test_sidebar_tooltips.py
@@ -54,3 +54,16 @@ def test_state_tooltip_does_not_clobber_attention_title():
     assert "else if(_stateTip) state.title=_stateTip;" in js
     # The old unconditional-clobber line must be gone.
     assert "state.title=_sessionStateTooltip({isStreaming,hasUnread});" not in js
+
+
+def test_fork_tooltip_preserves_localized_base():
+    """The fork tooltip must keep using the localized ``forked_from`` catalog
+    key rather than hardcoding an English string — dropping ``t('forked_from')``
+    was the one genuine i18n regression in the tooltip rework.
+    """
+    js = _sessions_js()
+    assert "function _sessionForkTooltip" in js
+    # Helper resolves the localized key with the usual typeof-t guard.
+    assert "t('forked_from')" in js
+    # The hardcoded English sentence from the first cut must be gone.
+    assert "Forked conversation — parent:" not in js

From 6ecc32be002bca87a37524550a8fe671720ff301 Mon Sep 17 00:00:00 2001
From: AJV20 <24819659+AJV20@users.noreply.github.com>
Date: Sat, 30 May 2026 19:22:56 -0400
Subject: [PATCH 312/349] Close evicted cached agents on identity mismatch

---
 CHANGELOG.md                                  |  3 ++
 api/streaming.py                              | 48 +++++++++++++++----
 tests/test_session_cache_ownership.py         | 10 +++-
 tests/test_streaming_agent_cache_lifecycle.py | 48 +++++++++++++++++++
 4 files changed, 99 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a7aa6cdde..c8e6287eb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 
 ## [Unreleased]
 
+### Fixed
+- Cached agents evicted after session-identity mismatches, unsafe runtime refresh, credential self-heal, or skipped compression migration now go through the normal session-boundary teardown path, committing pending memory and closing provider/session resources instead of silently dropping the cache entry (#3215).
+
 ## [v0.51.180] — 2026-05-30 — Release EZ (stage-batch62 — session/agent cache ownership hardening)
 
 ### Fixed
diff --git a/api/streaming.py b/api/streaming.py
index 41fa028a9c..a83d1e0670 100644
--- a/api/streaming.py
+++ b/api/streaming.py
@@ -3577,8 +3577,11 @@ def _attempt_credential_self_heal(
             return None
 
         # 2. Evict the cached agent for this session
+        _evicted_entry = None
         with SESSION_AGENT_CACHE_LOCK:
-            SESSION_AGENT_CACHE.pop(session_id, None)
+            _evicted_entry = SESSION_AGENT_CACHE.pop(session_id, None)
+        if _evicted_entry is not None:
+            _close_cached_agent_entry_at_session_boundary(session_id, _evicted_entry)
 
         # 3. Invalidate the credential pool for this provider
         invalidate_credential_pool_cache(provider_id)
@@ -3680,6 +3683,12 @@ def _close_evicted_agent_at_session_boundary(session_id: str, agent) -> bool:
     return True
 
 
+def _close_cached_agent_entry_at_session_boundary(session_id: str, cache_entry) -> bool:
+    """Commit and tear down a popped SESSION_AGENT_CACHE entry outside the cache lock."""
+    agent = cache_entry[0] if isinstance(cache_entry, tuple) else None
+    return _close_evicted_agent_at_session_boundary(session_id, agent)
+
+
 def _refresh_cached_agent_runtime(agent, agent_kwargs: dict) -> bool:
     """Refresh volatile runtime credentials on a reused cached AIAgent.
 
@@ -4887,6 +4896,7 @@ def _fallback_entries(_raw):
                 _agent_sig = _hashlib.sha256(_sig_blob.encode()).hexdigest()[:16]
 
                 agent = None
+                _identity_mismatch_entry = None
                 with SESSION_AGENT_CACHE_LOCK:
                     _cached = SESSION_AGENT_CACHE.get(session_id)
                     if _cached and _cached[1] == _agent_sig:
@@ -4896,7 +4906,7 @@ def _fallback_entries(_raw):
                             SESSION_AGENT_CACHE.move_to_end(session_id)  # LRU: mark as recently used
                             logger.debug('[webui] Reusing cached agent for session %s', session_id)
                         else:
-                            SESSION_AGENT_CACHE.pop(session_id, None)
+                            _identity_mismatch_entry = SESSION_AGENT_CACHE.pop(session_id, None)
                             logger.warning(
                                 '[webui] Evicted cached agent with mismatched session identity: cache_key=%s agent_session_id=%s',
                                 session_id,
@@ -4911,6 +4921,12 @@ def _fallback_entries(_raw):
                         except Exception:
                             logger.debug("Lifecycle register_agent failed for cached session %s", session_id, exc_info=True)
 
+                if _identity_mismatch_entry is not None:
+                    try:
+                        _close_cached_agent_entry_at_session_boundary(session_id, _identity_mismatch_entry)
+                    except Exception:
+                        logger.debug("Failed to close identity-mismatched cached agent for session %s", session_id, exc_info=True)
+
                 if agent is not None:
                     # Refresh volatile runtime credentials selected from provider
                     # pools without discarding cross-turn agent/provider state.
@@ -4919,13 +4935,14 @@ def _fallback_entries(_raw):
                             '[webui] Cached agent runtime could not be safely refreshed; rebuilding agent for session %s',
                             session_id,
                         )
-                        try:
-                            if getattr(agent, '_session_db', None) is not None:
-                                agent._session_db.close()
-                        except Exception:
-                            pass
+                        _stale_runtime_entry = None
                         with SESSION_AGENT_CACHE_LOCK:
-                            SESSION_AGENT_CACHE.pop(session_id, None)
+                            _stale_runtime_entry = SESSION_AGENT_CACHE.pop(session_id, None)
+                        if _stale_runtime_entry is not None:
+                            try:
+                                _close_cached_agent_entry_at_session_boundary(session_id, _stale_runtime_entry)
+                            except Exception:
+                                logger.debug("Failed to close stale-runtime cached agent for session %s", session_id, exc_info=True)
                         agent = None
 
                 if agent is not None:
@@ -5564,6 +5581,7 @@ def _periodic_checkpoint():
                     # Migrate cached agent to the new session ID so the turn
                     # count survives context compression.
                     from api.config import SESSION_AGENT_CACHE, SESSION_AGENT_CACHE_LOCK
+                    _skipped_agent_migration_entry = None
                     with SESSION_AGENT_CACHE_LOCK:
                         _cached_entry = SESSION_AGENT_CACHE.pop(old_sid, None)
                         if _cached_entry:
@@ -5571,12 +5589,18 @@ def _periodic_checkpoint():
                             if _cached_agent_matches_session(_cached_agent, new_sid):
                                 SESSION_AGENT_CACHE[new_sid] = _cached_entry
                             else:
+                                _skipped_agent_migration_entry = _cached_entry
                                 logger.warning(
                                     '[webui] Skipped cached agent migration with mismatched session identity: old_sid=%s new_sid=%s agent_session_id=%s',
                                     old_sid,
                                     new_sid,
                                     _cached_agent_session_identity(_cached_agent),
                                 )
+                    if _skipped_agent_migration_entry is not None:
+                        try:
+                            _close_cached_agent_entry_at_session_boundary(old_sid, _skipped_agent_migration_entry)
+                        except Exception:
+                            logger.debug("Failed to close skipped compression-migration cached agent for session %s", old_sid, exc_info=True)
                     _compressed = True
                 # Also detect compression via the result dict or compressor state
                 if not _compressed:
@@ -6450,18 +6474,24 @@ def _handle_chat_steer(handler, body: dict) -> bool:
     if not text:
         return bad(handler, "text required")
 
+    evicted_cached_entry = None
     with _cfg.SESSION_AGENT_CACHE_LOCK:
         cached = _cfg.SESSION_AGENT_CACHE.get(sid)
         if cached:
             agent = cached[0]
             if not _cached_agent_matches_session(agent, sid):
-                _cfg.SESSION_AGENT_CACHE.pop(sid, None)
+                evicted_cached_entry = _cfg.SESSION_AGENT_CACHE.pop(sid, None)
                 logger.warning(
                     '[webui] Evicted cached agent before steer due to mismatched session identity: cache_key=%s agent_session_id=%s',
                     sid,
                     _cached_agent_session_identity(agent),
                 )
                 cached = None
+    if evicted_cached_entry is not None:
+        try:
+            _close_cached_agent_entry_at_session_boundary(sid, evicted_cached_entry)
+        except Exception:
+            logger.debug("Failed to close steer identity-mismatched cached agent for session %s", sid, exc_info=True)
     if not cached:
         # No active agent for this session — caller falls back to interrupt
         return j(handler, {"accepted": False, "fallback": "no_cached_agent",
diff --git a/tests/test_session_cache_ownership.py b/tests/test_session_cache_ownership.py
index 3e3ee33679..882b1fcd24 100644
--- a/tests/test_session_cache_ownership.py
+++ b/tests/test_session_cache_ownership.py
@@ -87,7 +87,8 @@ def test_cached_agent_session_identity_matches_requested_sid():
     assert _cached_agent_matches_session(legacy, "requested") is True
 
 
-def test_handle_chat_steer_evicts_mismatched_cached_agent():
+def test_handle_chat_steer_evicts_mismatched_cached_agent(monkeypatch):
+    import api.streaming as streaming
     from api.streaming import _handle_chat_steer
 
     class Handler:
@@ -108,6 +109,12 @@ def end_headers(self):
             pass
 
     wrong_agent = SimpleNamespace(session_id="other-session", steer=lambda _text: True)
+    closed_entries = []
+    monkeypatch.setattr(
+        streaming,
+        "_close_cached_agent_entry_at_session_boundary",
+        lambda session_id, entry: closed_entries.append((session_id, entry)),
+    )
     config.SESSION_AGENT_CACHE.clear()
     config.SESSION_AGENT_CACHE["requested"] = (wrong_agent, "sig")
     handler = Handler()
@@ -118,5 +125,6 @@ def end_headers(self):
     assert handler.status == 200
     assert payload == {"accepted": False, "fallback": "no_cached_agent", "stream_id": None}
     assert "requested" not in config.SESSION_AGENT_CACHE
+    assert closed_entries == [("requested", (wrong_agent, "sig"))]
 
     config.SESSION_AGENT_CACHE.clear()
diff --git a/tests/test_streaming_agent_cache_lifecycle.py b/tests/test_streaming_agent_cache_lifecycle.py
index d57aebd92f..815b9fcba2 100644
--- a/tests/test_streaming_agent_cache_lifecycle.py
+++ b/tests/test_streaming_agent_cache_lifecycle.py
@@ -51,6 +51,22 @@ def test_evicted_agent_lifecycle_shutdown_uses_empty_messages_when_missing(monke
     agent._session_db.close.assert_called_once()
 
 
+def test_cached_agent_entry_lifecycle_extracts_agent_from_cache_tuple(monkeypatch):
+    import api.streaming as streaming
+
+    closed = []
+    monkeypatch.setattr(
+        streaming,
+        "_close_evicted_agent_at_session_boundary",
+        lambda session_id, agent: closed.append((session_id, agent)) or True,
+    )
+
+    agent = MagicMock()
+
+    assert streaming._close_cached_agent_entry_at_session_boundary("old-session", (agent, "sig")) is True
+    assert closed == [("old-session", agent)]
+
+
 def test_evicted_agent_lifecycle_keeps_provider_alive_when_commit_still_dirty(monkeypatch):
     import api.streaming as streaming
 
@@ -71,3 +87,35 @@ def fake_has_uncommitted_work(session_id):
 
     agent.shutdown_memory_provider.assert_not_called()
     agent._session_db.close.assert_not_called()
+
+
+def test_identity_mismatch_cache_evictions_close_entries_outside_cache_lock():
+    src = open("api/streaming.py", encoding="utf-8").read()
+
+    expected_markers = [
+        "_identity_mismatch_entry = SESSION_AGENT_CACHE.pop(session_id, None)",
+        "_stale_runtime_entry = SESSION_AGENT_CACHE.pop(session_id, None)",
+        "_skipped_agent_migration_entry = _cached_entry",
+        "evicted_cached_entry = _cfg.SESSION_AGENT_CACHE.pop(sid, None)",
+    ]
+    for marker in expected_markers:
+        assert marker in src
+
+    close_markers = [
+        "_close_cached_agent_entry_at_session_boundary(session_id, _identity_mismatch_entry)",
+        "_close_cached_agent_entry_at_session_boundary(session_id, _stale_runtime_entry)",
+        "_close_cached_agent_entry_at_session_boundary(old_sid, _skipped_agent_migration_entry)",
+        "_close_cached_agent_entry_at_session_boundary(sid, evicted_cached_entry)",
+    ]
+    lines = src.splitlines()
+    for marker in close_markers:
+        close_idx = next(i for i, line in enumerate(lines) if marker in line)
+        lock_idx = max(i for i, line in enumerate(lines[:close_idx]) if "with SESSION_AGENT_CACHE_LOCK:" in line)
+        lock_indent = len(lines[lock_idx]) - len(lines[lock_idx].lstrip())
+        between = lines[lock_idx + 1:close_idx]
+        assert any(
+            line.strip()
+            and not line.lstrip().startswith("#")
+            and len(line) - len(line.lstrip()) <= lock_indent
+            for line in between
+        ), f"{marker} still appears inside the SESSION_AGENT_CACHE_LOCK block"

From 5134d896bab08cf2b8b21eba592b6fb5e571d1a6 Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sun, 31 May 2026 00:07:39 +0000
Subject: [PATCH 313/349] absorb #3201: set _streamFinalized immediately in SSE
 done handler (closes #3195)

Keeps the messages.js fix from @mysoul12138 (set _streamFinalized=true right
after the early-return guard, before the fade window, so a stream_end arriving
mid-fade can't call _restoreSettledSession and overwrite live messages with a
stale server snapshot). Drops the contributor's dead empty `else {}` block in
ui.js (no behavior). Adds a regression test pinning the immediate-finalize order.

Co-authored-by: mysoul12138 
---
 CHANGELOG.md                     |  5 ++++-
 static/messages.js               |  5 +++++
 tests/test_streaming_race_fix.py | 23 +++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8e6287eb9..b3dcb02501 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,11 @@
 
 ## [Unreleased]
 
+## [v0.51.181] — 2026-05-30 — Release FA (stage-batchA — agent-cache eviction teardown + streaming finalize race)
+
 ### Fixed
-- Cached agents evicted after session-identity mismatches, unsafe runtime refresh, credential self-heal, or skipped compression migration now go through the normal session-boundary teardown path, committing pending memory and closing provider/session resources instead of silently dropping the cache entry (#3215).
+- Cached agents evicted after session-identity mismatches, unsafe runtime refresh, credential self-heal, or skipped compression migration now go through the normal session-boundary teardown path, committing pending memory and closing provider/session resources instead of silently dropping the cache entry (#3218, closes #3215).
+- Assistant streaming text is no longer lost when a stream completes while you have switched to a different session tab: the SSE `done` handler now sets the stream-finalized flag immediately (before the fade window), so a `stream_end` event arriving mid-fade can no longer trigger `_restoreSettledSession()` and overwrite the live messages with a stale server snapshot (#3201, closes #3195).
 
 ## [v0.51.180] — 2026-05-30 — Release EZ (stage-batch62 — session/agent cache ownership hardening)
 
diff --git a/static/messages.js b/static/messages.js
index b3339610c4..df823092e8 100644
--- a/static/messages.js
+++ b/static/messages.js
@@ -1821,6 +1821,11 @@ function attachLiveStream(activeSid, streamId, uploaded=[], options={}){
 
     source.addEventListener('done',e=>{
       if(_streamFinalized) return;
+      // Set _streamFinalized IMMEDIATELY — before any fade delay. Without this,
+      // a stream_end event arriving during the fade window sees
+      // _streamFinalized=false, calls _restoreSettledSession(), and overwrites
+      // S.messages with stale server data (issue #3195).
+      _streamFinalized=true;
       _terminalStateReached=true;
       if(_persistTimer){clearTimeout(_persistTimer);_persistTimer=null;}
       const _doneData=JSON.parse(e.data);
diff --git a/tests/test_streaming_race_fix.py b/tests/test_streaming_race_fix.py
index aeba1531b1..36aed1f807 100644
--- a/tests/test_streaming_race_fix.py
+++ b/tests/test_streaming_race_fix.py
@@ -71,6 +71,29 @@ def test_done_sets_stream_finalized(self):
             "'done' handler must call finalizeThinkingCard() to close thinking card"
         )
 
+    def test_done_sets_stream_finalized_before_fade_window(self):
+        """#3195 regression: the 'done' handler must set _streamFinalized=true
+        IMMEDIATELY after the early-return guard — before the fade machinery /
+        _finishDone() closure runs. Otherwise a stream_end event arriving during
+        the fade window sees _streamFinalized=false, calls _restoreSettledSession(),
+        and overwrites S.messages with stale server data (assistant text between
+        tool-call blocks vanishes on switching back to a settled session).
+        """
+        src = read('static/messages.js')
+        m = re.search(r"source\.addEventListener\('done'.*?\}\);", src, re.DOTALL)
+        assert m, "'done' handler not found"
+        fn = m.group(0)
+        guard_idx = fn.find('if(_streamFinalized) return;')
+        assert guard_idx != -1, "'done' handler must early-return on _streamFinalized"
+        finalize_idx = fn.find('_streamFinalized=true', guard_idx)
+        terminal_idx = fn.find('_terminalStateReached=true', guard_idx)
+        assert finalize_idx != -1, "'done' handler must set _streamFinalized=true"
+        assert terminal_idx != -1, "'done' handler must set _terminalStateReached"
+        assert finalize_idx < terminal_idx, (
+            "_streamFinalized=true must be set immediately after the guard "
+            "(before _terminalStateReached / fade machinery) — #3195"
+        )
+
     def test_apperror_sets_stream_finalized(self):
         src = read('static/messages.js')
         m = re.search(r"source\.addEventListener\('apperror'.*?\}\);", src, re.DOTALL)

From 634a70bebf156201f7947a89cee1733a086adefb Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sun, 31 May 2026 00:26:59 +0000
Subject: [PATCH 314/349] test(#3218): extend cache-eviction lock-discipline
 guard to the self-heal site (Opus NIT)

Opus advisor noted the static guard covered 4 of the 5 identity-mismatch
eviction sites; add the credential-self-heal pop/close pair so a future
re-lock of that path is caught by the gate too.
---
 tests/test_streaming_agent_cache_lifecycle.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/test_streaming_agent_cache_lifecycle.py b/tests/test_streaming_agent_cache_lifecycle.py
index 815b9fcba2..1cf513be4e 100644
--- a/tests/test_streaming_agent_cache_lifecycle.py
+++ b/tests/test_streaming_agent_cache_lifecycle.py
@@ -97,6 +97,7 @@ def test_identity_mismatch_cache_evictions_close_entries_outside_cache_lock():
         "_stale_runtime_entry = SESSION_AGENT_CACHE.pop(session_id, None)",
         "_skipped_agent_migration_entry = _cached_entry",
         "evicted_cached_entry = _cfg.SESSION_AGENT_CACHE.pop(sid, None)",
+        "_evicted_entry = SESSION_AGENT_CACHE.pop(session_id, None)",
     ]
     for marker in expected_markers:
         assert marker in src
@@ -106,6 +107,7 @@ def test_identity_mismatch_cache_evictions_close_entries_outside_cache_lock():
         "_close_cached_agent_entry_at_session_boundary(session_id, _stale_runtime_entry)",
         "_close_cached_agent_entry_at_session_boundary(old_sid, _skipped_agent_migration_entry)",
         "_close_cached_agent_entry_at_session_boundary(sid, evicted_cached_entry)",
+        "_close_cached_agent_entry_at_session_boundary(session_id, _evicted_entry)",
     ]
     lines = src.splitlines()
     for marker in close_markers:

From 5b2cbe1323c1dcae41dd04d2fa3cc215b2f5b136 Mon Sep 17 00:00:00 2001
From: nesquena-hermes 
Date: Sat, 30 May 2026 18:48:25 -0700
Subject: [PATCH 315/349] ci: add headless browser smoke test (runtime
 brick-class gate) (#3231)

Boots the real server.py agent-free and loads the key pages in headless
Chromium, failing on any console error or uncaught JS exception. Catches the
runtime-JS brick class (const-reassign #3162, function/window collision
#2715/#2771) that node --check, ESLint, and the mocked pytest suite cannot see
because they only manifest when a real browser executes the page.

Credential-free: strips *_API_KEY from the env, drives no real model, needs no
secrets. Runs on every PR + push via .github/workflows/browser-smoke.yml.

Co-authored-by: nesquena-hermes <[email protected]>
---
 .github/workflows/browser-smoke.yml |  42 +++++++
 CHANGELOG.md                        |   3 +
 TESTING.md                          |  26 +++++
 tests/browser_smoke.py              | 171 ++++++++++++++++++++++++++++
 4 files changed, 242 insertions(+)
 create mode 100644 .github/workflows/browser-smoke.yml
 create mode 100644 tests/browser_smoke.py

diff --git a/.github/workflows/browser-smoke.yml b/.github/workflows/browser-smoke.yml
new file mode 100644
index 0000000000..b0b2eb11f1
--- /dev/null
+++ b/.github/workflows/browser-smoke.yml
@@ -0,0 +1,42 @@
+name: Browser smoke
+
+# Headless page-load smoke: boots the real server.py (agent-free) and loads the
+# key pages in Chromium, failing on any console error or uncaught JS exception.
+# This catches the runtime-JS brick class (const-reassign, function/window
+# collision) that `node --check`, ESLint, and the mocked pytest suite cannot
+# see — they only manifest when a real browser executes the page.
+#
+# No secrets, no credentials: the server boots agent-free and the smoke script
+# strips every *_API_KEY from the environment before launch.
+
+on:
+  pull_request:
+    branches: [master]
+  push:
+    branches: [master]
+
+jobs:
+  browser-smoke:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+          cache: 'pip'
+          cache-dependency-path: |
+            **/requirements*.txt
+            **/pyproject.toml
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install "pyyaml>=6.0" playwright
+          # Install only the Chromium browser + its system deps.
+          python -m playwright install --with-deps chromium
+
+      - name: Run browser smoke
+        run: python tests/browser_smoke.py
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3dcb02501..a17485683d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 
 ## [Unreleased]
 
+### Added
+- CI now runs a headless browser smoke test (`tests/browser_smoke.py`, `.github/workflows/browser-smoke.yml`) on every PR and push: it boots the real server agent-free and loads the key pages in Chromium, failing on any console error or uncaught JS exception. This catches the runtime-JS brick class (e.g. a `const` reassigned at runtime as in #3162, or a `function`/`window` name collision as in #2715/#2771) that `node --check`, ESLint, and the mocked test suite cannot see because they only manifest when a real browser executes the page. The smoke is credential-free — it strips `*_API_KEY` from the environment and drives no real model.
+
 ## [v0.51.181] — 2026-05-30 — Release FA (stage-batchA — agent-cache eviction teardown + streaming finalize race)
 
 ### Fixed
diff --git a/TESTING.md b/TESTING.md
index 4cdb086fd6..a065ac075e 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -36,6 +36,32 @@ npm run lint:runtime
 npx eslint --no-config-lookup -c eslint.runtime-guard.config.mjs "static/**/*.js"
 ```
 
+## Automated browser smoke (runtime brick-class gate)
+
+The ESLint guard above catches `const`-reassign / import-assign statically. The
+**browser smoke** catches the same brick class *dynamically* — plus anything else
+that throws only when a real browser executes the page (e.g. a `function X(){}` /
+`window.X = {}` name collision like #2715/#2771, which ESLint can't see).
+
+`tests/browser_smoke.py` boots the real `server.py` (agent-free, on an ephemeral
+port, with an isolated temp state dir) and loads the key pages in headless
+Chromium, failing if **any** console error or uncaught JS exception fires on load.
+It runs in CI (`.github/workflows/browser-smoke.yml`) on every PR and push to
+master, and locally:
+
+```bash
+pip install playwright && python -m playwright install chromium
+python tests/browser_smoke.py
+```
+
+It is intentionally **credential-free**: it strips every `*_API_KEY` from the
+environment before launching the server, needs no secrets, and does not drive a
+real model (it verifies the app *loads and initializes* cleanly — the brick class
+that breaks the page for everyone). A full chat golden-path E2E (send → stream →
+render → switch → reload) lives in the maintainer's private QA harness, which has
+the agent + a mock LLM provider available.
+
+
 `tests/test_static_js_runtime_lint.py` runs this automatically when eslint is present
 and **skips gracefully** (clear message) when it isn't — so environments without the
 node toolchain aren't blocked, while the release gate (which installs eslint) enforces it.
diff --git a/tests/browser_smoke.py b/tests/browser_smoke.py
new file mode 100644
index 0000000000..7d84ae0463
--- /dev/null
+++ b/tests/browser_smoke.py
@@ -0,0 +1,171 @@
+#!/usr/bin/env python3
+"""
+Headless browser smoke test — the console-error page-load gate.
+
+WHY THIS EXISTS
+  `node --check`, ESLint, and the (mocked) pytest suite cannot see the class of
+  bug that has actually bricked releases: JavaScript that parses fine but throws
+  at *runtime* when a real browser executes the page. Examples that shipped:
+    - a `const` reassigned at runtime (v0.51.168 "Failed to load conversation
+      messages" — #3162)
+    - a `function X(){}` colliding with a `window.X = {}` in classic scripts
+      (#2715 / #2771)
+  Every one of those throws on load or first interaction and produces a blank or
+  broken page for *every* user. This smoke boots the real server.py and loads
+  the key pages in headless Chromium, failing if ANY uncaught exception or
+  console error fires.
+
+SCOPE
+  Deliberately AGENT-FREE so it runs in CI (which does not install hermes-agent):
+  it verifies the page loads and its JS initializes cleanly — it does NOT drive a
+  full chat (that needs the agent + mock provider and runs in the private QA
+  harness's golden-path E2E). This is the "does the app even come up without
+  throwing" gate, which is the highest-frequency brick class.
+
+USAGE
+  python tests/browser_smoke.py
+  (Requires: playwright + chromium. Boots server.py on an ephemeral port with an
+  isolated temp state dir and no agent.)
+
+EXIT CODES
+  0 — all pages loaded with zero console errors / uncaught exceptions
+  1 — a console error or uncaught exception was detected (regression)
+  2 — environment/setup failure (server didn't boot, playwright missing, etc.)
+"""
+import os
+import subprocess
+import sys
+import tempfile
+import time
+import urllib.request
+import urllib.error
+
+PORT = int(os.getenv("SMOKE_PORT", "8796"))
+BASE = f"http://127.0.0.1:{PORT}"
+
+# Pages that must load cleanly. Hash routes are how the SPA exposes views.
+PAGES = [
+    "/",
+    "/#settings",
+    "/#sessions",
+]
+
+# Known-benign console noise (extend deliberately, each with a reason). Every
+# entry here is a blind spot, so keep the list short.
+BENIGN = [
+    "favicon",          # favicon 404 in bare env — not app code
+    "manifest.json",    # PWA manifest probe under headless http
+    "serviceworker",    # SW registration noise under headless http
+    "sw.js",            # service worker fetch noise
+    "the server responded with a status of 404",  # static asset 404 in bare env
+]
+
+
+def _is_benign(text):
+    t = text.lower()
+    return any(p.lower() in t for p in BENIGN)
+
+
+def _wait_for_health(timeout=30):
+    deadline = time.time() + timeout
+    while time.time() < deadline:
+        try:
+            with urllib.request.urlopen(BASE + "/health", timeout=2) as r:
+                if r.status == 200:
+                    return True
+        except (urllib.error.URLError, OSError):
+            pass
+        time.sleep(0.5)
+    return False
+
+
+def main():
+    try:
+        from playwright.sync_api import sync_playwright
+    except ImportError:
+        print("SKIP: playwright not installed", file=sys.stderr)
+        return 2
+
+    repo_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    server_py = os.path.join(repo_root, "server.py")
+    if not os.path.exists(server_py):
+        print(f"SETUP FAIL: server.py not found at {server_py}", file=sys.stderr)
+        return 2
+
+    state_dir = tempfile.mkdtemp(prefix="hermes-browser-smoke-")
+    env = os.environ.copy()
+    # Strip real provider keys so nothing leaks into the smoke server.
+    for k in list(env):
+        if k.endswith("_API_KEY"):
+            env.pop(k, None)
+    env.update({
+        "HERMES_WEBUI_PORT": str(PORT),
+        "HERMES_WEBUI_HOST": "127.0.0.1",
+        "HERMES_WEBUI_STATE_DIR": state_dir,
+        "HERMES_HOME": state_dir,
+        "HERMES_BASE_HOME": state_dir,
+        "HERMES_WEBUI_SKIP_ONBOARDING": "1",
+        # Point agent discovery at a path that doesn't exist — the server is
+        # designed to boot and serve the UI even when the agent is absent.
+        "HERMES_WEBUI_AGENT_DIR": os.path.join(state_dir, "no-agent"),
+    })
+
+    log = open(os.path.join(state_dir, "server.log"), "w")
+    proc = subprocess.Popen(
+        [sys.executable, server_py], cwd=repo_root, env=env,
+        stdout=log, stderr=subprocess.STDOUT,
+    )
+    try:
+        if not _wait_for_health(timeout=30):
+            print("SETUP FAIL: server did not become healthy in 30s", file=sys.stderr)
+            log.flush()
+            with open(os.path.join(state_dir, "server.log")) as f:
+                print(f.read()[-2000:], file=sys.stderr)
+            return 2
+
+        failures = []
+        with sync_playwright() as pw:
+            browser = pw.chromium.launch(
+                headless=True, args=["--no-sandbox", "--disable-dev-shm-usage"]
+            )
+            for path in PAGES:
+                ctx = browser.new_context(base_url=BASE)
+                page = ctx.new_page()
+                errors = []
+                page.on("console", lambda m: errors.append(("console", m.text))
+                        if m.type == "error" else None)
+                page.on("pageerror", lambda e: errors.append(("pageerror", str(e))))
+
+                page.goto(path, wait_until="domcontentloaded")
+                # Give boot.js / view init time to run and throw if it's going to.
+                try:
+                    page.wait_for_selector("#msg, .app, body", timeout=10000)
+                except Exception:
+                    pass
+                time.sleep(1.5)
+
+                meaningful = [(kind, txt) for (kind, txt) in errors if not _is_benign(txt)]
+                if meaningful:
+                    for kind, txt in meaningful:
+                        failures.append(f"  [{path}] {kind}: {txt}")
+                else:
+                    print(f"OK  {path} — no console errors")
+                ctx.close()
+            browser.close()
+
+        if failures:
+            print("\nBROWSER SMOKE FAILED — runtime JS errors detected:", file=sys.stderr)
+            print("\n".join(failures), file=sys.stderr)
+            return 1
+        print("\nBROWSER SMOKE PASSED — all pages loaded with zero console errors")
+        return 0
+    finally:
+        proc.terminate()
+        try:
+            proc.wait(timeout=5)
+        except subprocess.TimeoutExpired:
+            proc.kill()
+
+
+if __name__ == "__main__":
+    sys.exit(main())

From 5915d675a009cdad844bb1d226012660b1a874e8 Mon Sep 17 00:00:00 2001
From: Ed 
Date: Tue, 26 May 2026 16:48:34 +0200
Subject: [PATCH 316/349] =?UTF-8?q?docs:=20add=20GitHub=20search=20report?=
 =?UTF-8?q?=20=E2=80=94=20upstream=20issues/PRs=20related=20to=20fork=20co?=
 =?UTF-8?q?mmits?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 github-search-report.md | 53 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 github-search-report.md

diff --git a/github-search-report.md b/github-search-report.md
new file mode 100644
index 0000000000..98ec69a461
--- /dev/null
+++ b/github-search-report.md
@@ -0,0 +1,53 @@
+# GitHub Search Report — Hermes WebUI Fork Commits
+**Date:** 2026-05-26  
+**Searched:** `nesquena/hermes-webui` (upstream)  
+**Fork:** `someaka/hermes-webui`
+
+---
+
+## Commit `4f6cc97e` — `fix: update opencode-go base_url in provider overlap tests`
+
+Changes `api.opencode.ai/go/v1` → `opencode.ai/zen/go/v1` in `tests/test_issue1894_provider_overlap.py` (5 lines).
+
+### Issues mentioning (5 found, all CLOSED):
+
+| # | Title | State | Link |
+|---|-------|-------|------|
+| **#1894** | 401 error via opencode go deepseek model | CLOSED (2026-05-13) | [link](https://github.com/nesquena/hermes-webui/issues/1894) |
+| **#772** | Error: AIAgent credential_pool kwarg | CLOSED | [link](https://github.com/nesquena/hermes-webui/issues/772) |
+| **#794** | Response shows HTML from Opencode (followup to #772) | CLOSED | [link](https://github.com/nesquena/hermes-webui/issues/794) |
+| **#850** | Unable to send request to opencode model (followup to #772/#794) | CLOSED | [link](https://github.com/nesquena/hermes-webui/issues/850) |
+| **#2518** | New Conversation button unresponsive during cold model catalog | CLOSED | [link](https://github.com/nesquena/hermes-webui/issues/2518) |
+
+### PRs mentioning (3 found):
+
+| # | Title | State | Link |
+|---|-------|-------|------|
+| **#2204** | **Fix opencode-go custom provider overlap routing** | MERGED | [link](https://github.com/nesquena/hermes-webui/pull/2204) |
+| **#2209** | stage-350: medium-risk batch (includes #2204) | MERGED | [link](https://github.com/nesquena/hermes-webui/pull/2209) |
+| **#2179** | fix(config): preserve nvidia/ prefix on NVIDIA NIM | MERGED | [link](https://github.com/nesquena/hermes-webui/pull/2179) |
+
+### Key finding:
+
+**PR #2204** is the origin of `tests/test_issue1894_provider_overlap.py` — it was the actual fix for Issue #1894. Our fork's commit `4f6cc97e` only updated stale test assertions (the base_url string) to match the canonical URL already used in the upstream source code (`api/config.py`). The source code was already correct — only the test needed the sync.
+
+---
+
+## Commit `d7a915dd` — `Merge remote-tracking branch 'upstream/master'`
+
+No mentions found. This is a standard merge commit syncing with upstream.
+
+---
+
+## Commit `835fb746` — `chore: clean up test_issue1894_provider_overlap — remove vestigial noqa, add docstrings`
+
+No mentions found (created locally, pushed to fork only).
+
+---
+
+## Conclusion
+
+- **Zero** issues/PRs directly reference the `someaka/hermes-webui` fork
+- The upstream source code was already correct — our fork commit is a test-only sync
+- PR #2204 is the origin of the test file; our change keeps it aligned
+- All related upstream issues are CLOSED and the fix is MERGED

From 2cee44b1b285cd3e4670c1e222b8680572761b2d Mon Sep 17 00:00:00 2001
From: someaka 
Date: Fri, 22 May 2026 16:34:08 +0200
Subject: [PATCH 317/349] fix(helpers): catch client disconnect errors in
 response write path

Extract _safe_write() helper that wraps end_headers() + wfile.write()
in try/except (BrokenPipeError, ConnectionResetError, ConnectionAbortedError,
TimeoutError, ssl.SSLError).  Both j() and t() now use _safe_write()
instead of raw wfile calls.

Fixes cascading BrokenPipeError + SSL BAD_LENGTH crash when a client
disconnects mid-response and the error handler tries to write a 500
status through the same broken socket.
---
 api/helpers.py | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/api/helpers.py b/api/helpers.py
index 0fe91a2ea6..05fbd2f680 100644
--- a/api/helpers.py
+++ b/api/helpers.py
@@ -4,10 +4,23 @@
 import json as _json
 import os
 import re as _re
+import ssl
 from pathlib import Path
 from api.config import IMAGE_EXTS, MD_EXTS
 
 
+# Treat stalled/closed HTTP clients as normal disconnects.  Long-lived SSE
+# connections often end this way when a browser tab sleeps, a phone switches
+# networks, or Tailscale leaves the socket half-closed.
+_CLIENT_DISCONNECT_ERRORS = (
+    BrokenPipeError,
+    ConnectionResetError,
+    ConnectionAbortedError,
+    TimeoutError,
+    ssl.SSLError,
+)
+
+
 def require(body: dict, *fields) -> None:
     """Phase D: Validate required fields. Raises ValueError with clean message."""
     missing = [f for f in fields if not body.get(f) and body.get(f) != 0]
@@ -65,6 +78,15 @@ def _accepts_gzip(handler) -> bool:
     return 'gzip' in ae
 
 
+def _safe_write(handler, body: bytes) -> None:
+    """Write response body, silently ignoring client disconnect errors."""
+    try:
+        handler.end_headers()
+        handler.wfile.write(body)
+    except _CLIENT_DISCONNECT_ERRORS:
+        pass
+
+
 def j(handler, payload, status: int=200, extra_headers: dict=None) -> None:
     """Send a JSON response.
 
@@ -89,8 +111,7 @@ def j(handler, payload, status: int=200, extra_headers: dict=None) -> None:
     if extra_headers:
         for k, v in extra_headers.items():
             handler.send_header(k, v)
-    handler.end_headers()
-    handler.wfile.write(body)
+    _safe_write(handler, body)
 
 
 def t(handler, payload, status: int=200, content_type: str='text/plain; charset=utf-8') -> None:
@@ -101,8 +122,7 @@ def t(handler, payload, status: int=200, content_type: str='text/plain; charset=
     handler.send_header('Content-Length', str(len(body)))
     handler.send_header('Cache-Control', 'no-store')
     _security_headers(handler)
-    handler.end_headers()
-    handler.wfile.write(body)
+    _safe_write(handler, body)
 
 
 MAX_BODY_BYTES = 20 * 1024 * 1024  # 20MB limit for non-upload POST bodies

From e531a05e60e71fb31cd623c3d4528b390c5f7c7d Mon Sep 17 00:00:00 2001
From: someaka 
Date: Tue, 26 May 2026 21:45:05 +0200
Subject: [PATCH 318/349] fix(server): catch client disconnect errors in
 response write path

---
 server.py                         |  16 +-
 tests/test_broken_pipe_cascade.py | 279 ++++++++++++++++++++++++++++++
 2 files changed, 292 insertions(+), 3 deletions(-)
 create mode 100644 tests/test_broken_pipe_cascade.py

diff --git a/server.py b/server.py
index 9f4817996a..731fbfa8cc 100644
--- a/server.py
+++ b/server.py
@@ -164,7 +164,7 @@ def _build_csp_report_only_policy() -> str:
 
 from api.auth import check_auth
 from api.config import HOST, PORT, STATE_DIR, SESSION_DIR, DEFAULT_WORKSPACE
-from api.helpers import j, get_profile_cookie
+from api.helpers import j, get_profile_cookie, _CLIENT_DISCONNECT_ERRORS
 from api.profiles import set_request_profile, clear_request_profile
 from api.routes import handle_delete, handle_get, handle_patch, handle_post, handle_put
 from api.startup import auto_install_agent_deps, fix_credential_permissions
@@ -317,8 +317,13 @@ def do_GET(self) -> None:
             # reconnect races; do not convert it into a misleading server 500.
             return
         except Exception as e:
+            if isinstance(e, _CLIENT_DISCONNECT_ERRORS):
+                return
             print(f'[webui] ERROR {self.command} {self.path}\n' + traceback.format_exc(), flush=True)
-            return j(self, {'error': 'Internal server error'}, status=500)
+            try:
+                j(self, {'error': 'Internal server error'}, status=500)
+            except Exception:
+                pass
         finally:
             clear_request_profile()
 
@@ -348,8 +353,13 @@ def _handle_write(self, route_func) -> None:
             # reconnect races; do not convert it into a misleading server 500.
             return
         except Exception as e:
+            if isinstance(e, _CLIENT_DISCONNECT_ERRORS):
+                return
             print(f'[webui] ERROR {self.command} {self.path}\n' + traceback.format_exc(), flush=True)
-            return j(self, {'error': 'Internal server error'}, status=500)
+            try:
+                j(self, {'error': 'Internal server error'}, status=500)
+            except Exception:
+                pass
         finally:
             clear_request_profile()
 
diff --git a/tests/test_broken_pipe_cascade.py b/tests/test_broken_pipe_cascade.py
new file mode 100644
index 0000000000..b03e3c57cd
--- /dev/null
+++ b/tests/test_broken_pipe_cascade.py
@@ -0,0 +1,279 @@
+"""
+Test for BrokenPipeError + SSL BAD_LENGTH cascading failure fix.
+
+When a client disconnects mid-response:
+1. First write raises BrokenPipeError (or ssl.SSLError on TLS)
+2. Exception handler tries to send 500 JSON through same broken socket
+3. Without the fix, this produces a second exception and noisy traceback
+
+The fix:
+- helpers._safe_write() catches _CLIENT_DISCONNECT_ERRORS (including ssl.SSLError)
+- server.py exception handlers wrap their 500-response j() calls in try/except
+"""
+import ssl
+import unittest
+from unittest.mock import MagicMock
+
+import sys
+import os
+
+# Ensure project root is on path
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+from api.helpers import j, t, _safe_write, _CLIENT_DISCONNECT_ERRORS
+
+
+class MockHandler:
+    """Minimal mock of BaseHTTPRequestHandler for testing response helpers."""
+
+    def __init__(self, write_raises=None, end_headers_raises=None):
+        self._write_raises = write_raises
+        self._end_headers_raises = end_headers_raises
+        self.headers = {}
+        self._wfile = MagicMock()
+        self._sent_headers = []
+        self._response_status = None
+
+    @property
+    def wfile(self):
+        return self._wfile
+
+    def send_response(self, status):
+        self._response_status = status
+
+    def send_header(self, key, value):
+        self._sent_headers.append((key, value))
+
+    def end_headers(self):
+        if self._end_headers_raises:
+            raise self._end_headers_raises
+
+    def _wfile_write(self, data):
+        if self._write_raises:
+            raise self._write_raises
+        return len(data)
+
+
+class TestSafeWrite(unittest.TestCase):
+    """Test _safe_write swallows client disconnect errors silently."""
+
+    def _make_handler(self, end_headers_raises=None, write_raises=None):
+        handler = MockHandler(
+            end_headers_raises=end_headers_raises,
+            write_raises=write_raises,
+        )
+        handler.wfile.write = handler._wfile_write
+        return handler
+
+    def test_safe_write_success(self):
+        handler = self._make_handler()
+        _safe_write(handler, b"hello")
+        self.assertEqual(handler._response_status, None)  # send_response not called by _safe_write
+
+    def test_safe_write_broken_pipe(self):
+        handler = self._make_handler(write_raises=BrokenPipeError())
+        # Should NOT raise
+        _safe_write(handler, b"hello")
+
+    def test_safe_write_connection_reset(self):
+        handler = self._make_handler(write_raises=ConnectionResetError())
+        _safe_write(handler, b"hello")
+
+    def test_safe_write_connection_aborted(self):
+        handler = self._make_handler(write_raises=ConnectionAbortedError())
+        _safe_write(handler, b"hello")
+
+    def test_safe_write_timeout(self):
+        handler = self._make_handler(write_raises=TimeoutError())
+        _safe_write(handler, b"hello")
+
+    def test_safe_write_ssl_bad_length(self):
+        handler = self._make_handler(
+            write_raises=ssl.SSLError("[BAD_LENGTH] write failed")
+        )
+        _safe_write(handler, b"hello")
+
+    def test_safe_write_end_headers_broken_pipe(self):
+        handler = self._make_handler(end_headers_raises=BrokenPipeError())
+        _safe_write(handler, b"hello")
+
+    def test_safe_write_end_headers_ssl_error(self):
+        handler = self._make_handler(
+            end_headers_raises=ssl.SSLError("[BAD_LENGTH]")
+        )
+        _safe_write(handler, b"hello")
+
+    def test_safe_write_other_error_propagates(self):
+        handler = self._make_handler(write_raises=ValueError("unexpected"))
+        with self.assertRaises(ValueError):
+            _safe_write(handler, b"hello")
+
+
+class TestJsonHelper(unittest.TestCase):
+    """Test j() helper with disconnect errors."""
+
+    def _make_handler(self, end_headers_raises=None, write_raises=None):
+        handler = MockHandler(
+            end_headers_raises=end_headers_raises,
+            write_raises=write_raises,
+        )
+        handler.wfile.write = handler._wfile_write
+        return handler
+
+    def test_j_success(self):
+        handler = self._make_handler()
+        j(handler, {"ok": True}, status=200)
+        self.assertEqual(handler._response_status, 200)
+        self.assertTrue(any(h[0] == "Content-Type" for h in handler._sent_headers))
+
+    def test_j_broken_pipe_on_write(self):
+        handler = self._make_handler(write_raises=BrokenPipeError())
+        # Should NOT raise — headers sent, write fails silently
+        j(handler, {"ok": True}, status=200)
+        self.assertEqual(handler._response_status, 200)
+
+    def test_j_ssl_error_on_write(self):
+        handler = self._make_handler(
+            write_raises=ssl.SSLError("[BAD_LENGTH] write failed")
+        )
+        j(handler, {"ok": True}, status=200)
+        self.assertEqual(handler._response_status, 200)
+
+    def test_j_broken_pipe_on_end_headers(self):
+        handler = self._make_handler(end_headers_raises=BrokenPipeError())
+        j(handler, {"ok": True}, status=200)
+        self.assertEqual(handler._response_status, 200)
+
+
+class TestTextHelper(unittest.TestCase):
+    """Test t() helper with disconnect errors."""
+
+    def _make_handler(self, end_headers_raises=None, write_raises=None):
+        handler = MockHandler(
+            end_headers_raises=end_headers_raises,
+            write_raises=write_raises,
+        )
+        handler.wfile.write = handler._wfile_write
+        return handler
+
+    def test_t_success(self):
+        handler = self._make_handler()
+        t(handler, "hello", status=200)
+        self.assertEqual(handler._response_status, 200)
+
+    def test_t_broken_pipe(self):
+        handler = self._make_handler(write_raises=BrokenPipeError())
+        t(handler, "hello", status=200)
+        self.assertEqual(handler._response_status, 200)
+
+    def test_t_ssl_error(self):
+        handler = self._make_handler(
+            write_raises=ssl.SSLError("[BAD_LENGTH]")
+        )
+        t(handler, "hello", status=200)
+        self.assertEqual(handler._response_status, 200)
+
+
+class TestClientDisconnectErrorsTuple(unittest.TestCase):
+    """Verify _CLIENT_DISCONNECT_ERRORS includes all expected types."""
+
+    def test_includes_broken_pipe(self):
+        self.assertIn(BrokenPipeError, _CLIENT_DISCONNECT_ERRORS)
+
+    def test_includes_connection_reset(self):
+        self.assertIn(ConnectionResetError, _CLIENT_DISCONNECT_ERRORS)
+
+    def test_includes_connection_aborted(self):
+        self.assertIn(ConnectionAbortedError, _CLIENT_DISCONNECT_ERRORS)
+
+    def test_includes_timeout(self):
+        self.assertIn(TimeoutError, _CLIENT_DISCONNECT_ERRORS)
+
+    def test_includes_ssl_error(self):
+        self.assertIn(ssl.SSLError, _CLIENT_DISCONNECT_ERRORS)
+
+    def test_excludes_broad_oserror(self):
+        """OSError is too broad — it masks real errors like file-not-found."""
+        self.assertNotIn(OSError, _CLIENT_DISCONNECT_ERRORS)
+
+
+class TestServerDisconnectHandling(unittest.TestCase):
+    """Test server.py skips 500 response when client disconnects."""
+
+    def _make_handler(self, route_raises=None):
+        """Build a Handler with mocked socket and route."""
+        from server import Handler
+        handler = Handler.__new__(Handler)
+        handler.command = "GET"
+        handler.path = "/api/test"
+        handler._req_t0 = 0.0
+        handler.headers = {}
+        handler.wfile = MagicMock()
+        handler.wfile.write = MagicMock()
+        handler.send_response = MagicMock()
+        handler.send_header = MagicMock()
+        handler.end_headers = MagicMock()
+        handler._route_raises = route_raises
+        return handler
+
+    def test_do_get_skips_500_on_broken_pipe(self):
+        from server import Handler
+        handler = self._make_handler(route_raises=BrokenPipeError())
+
+        def _fake_handle_get(self, parsed):
+            raise self._route_raises
+
+        # Patch handle_get to raise BrokenPipeError
+        import server as _server_mod
+        orig_handle_get = _server_mod.handle_get
+        _server_mod.handle_get = _fake_handle_get
+        try:
+            Handler.do_GET(handler)
+        finally:
+            _server_mod.handle_get = orig_handle_get
+
+        # send_response should NEVER be called for the 500 — client is gone
+        handler.send_response.assert_not_called()
+
+    def test_handle_write_skips_500_on_connection_reset(self):
+        from server import Handler
+        handler = self._make_handler(route_raises=ConnectionResetError())
+        handler.command = "POST"
+
+        def _fake_route(self, parsed):
+            raise self._route_raises
+
+        import server as _server_mod
+        orig_check_auth = _server_mod.check_auth
+        _server_mod.check_auth = lambda h, p: True
+        try:
+            Handler._handle_write(handler, _fake_route)
+        finally:
+            _server_mod.check_auth = orig_check_auth
+
+        handler.send_response.assert_not_called()
+
+    def test_do_get_sends_500_on_real_error(self):
+        from server import Handler
+        handler = self._make_handler(route_raises=ValueError("real bug"))
+
+        def _fake_handle_get(self, parsed):
+            raise self._route_raises
+
+        import server as _server_mod
+        orig_handle_get = _server_mod.handle_get
+        orig_check_auth = _server_mod.check_auth
+        _server_mod.handle_get = _fake_handle_get
+        _server_mod.check_auth = lambda h, p: True
+        try:
+            Handler.do_GET(handler)
+        finally:
+            _server_mod.handle_get = orig_handle_get
+            _server_mod.check_auth = orig_check_auth
+
+        # Should send 500 for real errors
+        handler.send_response.assert_called_once_with(500)
+
+
+if __name__ == "__main__":
+    unittest.main()

From 59b7a3ac94b18a43f0a6822d2a1ecc0c77f89c1e Mon Sep 17 00:00:00 2001
From: Ed 
Date: Sat, 30 May 2026 16:51:58 +0200
Subject: [PATCH 319/349] fix: eliminate silent failures in client disconnect
 handling

- api/helpers.py: _safe_write() now logs disconnects at debug level
  instead of silently passing. No more invisible errors.

- server.py: Restructure exception handlers to catch
  _CLIENT_DISCONNECT_ERRORS first, then Exception. Remove the
  isinstance() filter inside except Exception (LBYL anti-pattern).
  The 500-response fallback now catches _CLIENT_DISCONNECT_ERRORS
  separately (expected) and logs unexpected failures via
  traceback.print_exc() instead of bare except Exception: pass.

- tests/test_broken_pipe_cascade.py: Add coverage for SSL/Timeout
  disconnect routing and 500-response safety (both disconnect
  survival and unexpected error logging).
---
 api/helpers.py                    |  16 ++++-
 server.py                         |  26 ++++---
 tests/test_broken_pipe_cascade.py | 115 +++++++++++++++++++++++++++++-
 3 files changed, 143 insertions(+), 14 deletions(-)

diff --git a/api/helpers.py b/api/helpers.py
index 05fbd2f680..e9abdbc1b0 100644
--- a/api/helpers.py
+++ b/api/helpers.py
@@ -79,12 +79,22 @@ def _accepts_gzip(handler) -> bool:
 
 
 def _safe_write(handler, body: bytes) -> None:
-    """Write response body, silently ignoring client disconnect errors."""
+    """Write response body, ignoring expected client disconnect errors.
+
+    Logs disconnects at debug level so they are observable without
+    polluting stdout/stderr during normal operation (SSE reconnects,
+    tab closes, mobile network switches, etc.).
+    """
     try:
         handler.end_headers()
         handler.wfile.write(body)
-    except _CLIENT_DISCONNECT_ERRORS:
-        pass
+    except _CLIENT_DISCONNECT_ERRORS as exc:
+        import logging
+        logging.getLogger("hermes.webui").debug(
+            "Client disconnected mid-response (%s): %s",
+            type(exc).__name__,
+            getattr(handler, "path", "?"),
+        )
 
 
 def j(handler, payload, status: int=200, extra_headers: dict=None) -> None:
diff --git a/server.py b/server.py
index 731fbfa8cc..74482266c5 100644
--- a/server.py
+++ b/server.py
@@ -311,19 +311,22 @@ def do_GET(self) -> None:
             result = handle_get(self, parsed)
             if result is False:
                 return j(self, {'error': 'not found'}, status=404)
-        except (BrokenPipeError, ConnectionResetError, ConnectionAbortedError):
+        except _CLIENT_DISCONNECT_ERRORS:
             # The browser/client closed the socket while we were writing the
             # response. This is expected for probes, tab closes, and SSE
             # reconnect races; do not convert it into a misleading server 500.
             return
-        except Exception as e:
-            if isinstance(e, _CLIENT_DISCONNECT_ERRORS):
-                return
+        except Exception:
             print(f'[webui] ERROR {self.command} {self.path}\n' + traceback.format_exc(), flush=True)
             try:
                 j(self, {'error': 'Internal server error'}, status=500)
-            except Exception:
+            except _CLIENT_DISCONNECT_ERRORS:
+                # Client disconnected while we were sending the 500 — nothing to do.
                 pass
+            except Exception:
+                # Unexpected failure while sending the error response itself.
+                # Log it so we know something is wrong with our error handler.
+                traceback.print_exc()
         finally:
             clear_request_profile()
 
@@ -347,19 +350,22 @@ def _handle_write(self, route_func) -> None:
             result = route_func(self, parsed)
             if result is False:
                 return j(self, {'error': 'not found'}, status=404)
-        except (BrokenPipeError, ConnectionResetError, ConnectionAbortedError):
+        except _CLIENT_DISCONNECT_ERRORS:
             # The browser/client closed the socket while we were writing the
             # response. This is expected for probes, tab closes, and SSE
             # reconnect races; do not convert it into a misleading server 500.
             return
-        except Exception as e:
-            if isinstance(e, _CLIENT_DISCONNECT_ERRORS):
-                return
+        except Exception:
             print(f'[webui] ERROR {self.command} {self.path}\n' + traceback.format_exc(), flush=True)
             try:
                 j(self, {'error': 'Internal server error'}, status=500)
-            except Exception:
+            except _CLIENT_DISCONNECT_ERRORS:
+                # Client disconnected while we were sending the 500 — nothing to do.
                 pass
+            except Exception:
+                # Unexpected failure while sending the error response itself.
+                # Log it so we know something is wrong with our error handler.
+                traceback.print_exc()
         finally:
             clear_request_profile()
 
diff --git a/tests/test_broken_pipe_cascade.py b/tests/test_broken_pipe_cascade.py
index b03e3c57cd..a1e2c1b04a 100644
--- a/tests/test_broken_pipe_cascade.py
+++ b/tests/test_broken_pipe_cascade.py
@@ -55,7 +55,7 @@ def _wfile_write(self, data):
 
 
 class TestSafeWrite(unittest.TestCase):
-    """Test _safe_write swallows client disconnect errors silently."""
+    """Test _safe_write swallows client disconnect errors without raising."""
 
     def _make_handler(self, end_headers_raises=None, write_raises=None):
         handler = MockHandler(
@@ -274,6 +274,119 @@ def _fake_handle_get(self, parsed):
         # Should send 500 for real errors
         handler.send_response.assert_called_once_with(500)
 
+    def test_do_get_skips_500_on_ssl_disconnect(self):
+        """SSL disconnect during route handling should not trigger 500."""
+        from server import Handler
+        handler = self._make_handler(route_raises=ssl.SSLError("[BAD_LENGTH]"))
+
+        def _fake_handle_get(self, parsed):
+            raise self._route_raises
+
+        import server as _server_mod
+        orig_handle_get = _server_mod.handle_get
+        _server_mod.handle_get = _fake_handle_get
+        try:
+            Handler.do_GET(handler)
+        finally:
+            _server_mod.handle_get = orig_handle_get
+
+        handler.send_response.assert_not_called()
+
+    def test_do_get_skips_500_on_timeout_disconnect(self):
+        """Timeout disconnect during route handling should not trigger 500."""
+        from server import Handler
+        handler = self._make_handler(route_raises=TimeoutError())
+
+        def _fake_handle_get(self, parsed):
+            raise self._route_raises
+
+        import server as _server_mod
+        orig_handle_get = _server_mod.handle_get
+        _server_mod.handle_get = _fake_handle_get
+        try:
+            Handler.do_GET(handler)
+        finally:
+            _server_mod.handle_get = orig_handle_get
+
+        handler.send_response.assert_not_called()
+
+
+class TestServer500ResponseSafety(unittest.TestCase):
+    """Test that 500-response failures are handled gracefully."""
+
+    def _make_handler(self, route_raises=None, json_write_raises=None):
+        """Build a Handler where the 500-response j() call may also fail."""
+        from server import Handler
+        handler = Handler.__new__(Handler)
+        handler.command = "GET"
+        handler.path = "/api/test"
+        handler._req_t0 = 0.0
+        handler.headers = {}
+        handler.wfile = MagicMock()
+        handler._json_write_raises = json_write_raises
+
+        def _raising_write(data):
+            if handler._json_write_raises:
+                raise handler._json_write_raises
+            return len(data)
+
+        handler.wfile.write = _raising_write
+        handler.send_response = MagicMock()
+        handler.send_header = MagicMock()
+        handler.end_headers = MagicMock()
+        handler._route_raises = route_raises
+        return handler
+
+    def test_500_response_survives_client_disconnect(self):
+        """If the 500-response itself hits a disconnect, don't crash."""
+        from server import Handler
+        handler = self._make_handler(
+            route_raises=ValueError("real bug"),
+            json_write_raises=BrokenPipeError(),
+        )
+
+        def _fake_handle_get(self, parsed):
+            raise self._route_raises
+
+        import server as _server_mod
+        orig_handle_get = _server_mod.handle_get
+        orig_check_auth = _server_mod.check_auth
+        _server_mod.handle_get = _fake_handle_get
+        _server_mod.check_auth = lambda h, p: True
+        try:
+            Handler.do_GET(handler)
+        finally:
+            _server_mod.handle_get = orig_handle_get
+            _server_mod.check_auth = orig_check_auth
+
+        # send_response WAS called (we tried to send 500), but write failed
+        handler.send_response.assert_called_once_with(500)
+
+    def test_500_response_logs_unexpected_failure(self):
+        """If the 500-response fails for a NON-disconnect reason, log it."""
+        from server import Handler
+        handler = self._make_handler(
+            route_raises=ValueError("real bug"),
+            json_write_raises=RuntimeError("json serializer exploded"),
+        )
+
+        def _fake_handle_get(self, parsed):
+            raise self._route_raises
+
+        import server as _server_mod
+        orig_handle_get = _server_mod.handle_get
+        orig_check_auth = _server_mod.check_auth
+        _server_mod.handle_get = _fake_handle_get
+        _server_mod.check_auth = lambda h, p: True
+        try:
+            Handler.do_GET(handler)
+        finally:
+            _server_mod.handle_get = orig_handle_get
+            _server_mod.check_auth = orig_check_auth
+
+        # send_response WAS called (we tried to send 500), but write failed
+        handler.send_response.assert_called_once_with(500)
+
 
 if __name__ == "__main__":
     unittest.main()

From 78652ecdeae12c9a8da7e216e6223c146df7e734 Mon Sep 17 00:00:00 2001
From: Ed 
Date: Sun, 31 May 2026 02:06:17 +0200
Subject: [PATCH 320/349] fix: consolidate _CLIENT_DISCONNECT_ERRORS, remove
 scratch file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Address review feedback from @nesquena-hermes on PR #3210:

1. Deduplicate _CLIENT_DISCONNECT_ERRORS:
   - Single authoritative definition in api/helpers.py
   - api/routes.py now imports from api.helpers instead of defining
     its own copy with different membership
   - Unified tuple uses OSError (covers ssl.SSLError since it
     subclasses OSError) — broad socket-level disconnect coverage

2. Remove github-search-report.md:
   - Research scratch output that doesn't belong in the repo root
   - Content belongs in PR description or a gist

3. Docstring improvement:
   - Added comment explaining why OSError covers ssl.SSLError
   - Documents the errno-level socket errors caught by OSError
---
 api/helpers.py          |  7 ++++--
 api/routes.py           | 14 +----------
 github-search-report.md | 53 -----------------------------------------
 3 files changed, 6 insertions(+), 68 deletions(-)
 delete mode 100644 github-search-report.md

diff --git a/api/helpers.py b/api/helpers.py
index e9abdbc1b0..d51f518cf1 100644
--- a/api/helpers.py
+++ b/api/helpers.py
@@ -4,7 +4,6 @@
 import json as _json
 import os
 import re as _re
-import ssl
 from pathlib import Path
 from api.config import IMAGE_EXTS, MD_EXTS
 
@@ -12,12 +11,16 @@
 # Treat stalled/closed HTTP clients as normal disconnects.  Long-lived SSE
 # connections often end this way when a browser tab sleeps, a phone switches
 # networks, or Tailscale leaves the socket half-closed.
+#
+# ssl.SSLError subclasses OSError, so the bare OSError arm already catches
+# SSL-level disconnects.  We keep OSError explicitly for socket-level errors
+# (errno 32 EPIPE, 54 ECONNRESET, 104 ECONNABORTED, 110 ETIMEDOUT).
 _CLIENT_DISCONNECT_ERRORS = (
     BrokenPipeError,
     ConnectionResetError,
     ConnectionAbortedError,
     TimeoutError,
-    ssl.SSLError,
+    OSError,
 )
 
 
diff --git a/api/routes.py b/api/routes.py
index 66d237f772..16ac8297cc 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -40,19 +40,6 @@
 
 logger = logging.getLogger(__name__)
 
-# Treat stalled/closed HTTP clients as normal disconnects.  Long-lived SSE
-# connections often end this way when a browser tab sleeps, a phone switches
-# networks, or Tailscale leaves the socket half-closed.  If these bubble to the
-# request handler, the server logs 500s and can leave CLOSE-WAIT sockets around
-# until the OS-level timeout fires.
-_CLIENT_DISCONNECT_ERRORS = (
-    BrokenPipeError,
-    ConnectionResetError,
-    ConnectionAbortedError,
-    TimeoutError,
-    OSError,
-)
-
 # ── Cron run tracking ────────────────────────────────────────────────────────
 # Track job IDs currently being executed so the frontend can poll status.
 _RUNNING_CRON_JOBS: dict[str, float] = {}  # job_id → start_timestamp
@@ -1054,6 +1041,7 @@ def _clear_live_models_cache() -> None:
     _sanitize_error,
     redact_session_data,
     _redact_text,
+    _CLIENT_DISCONNECT_ERRORS,
 )
 from api.agent_health import build_agent_health_payload
 from api.gateway_chat import gateway_chat_config_status
diff --git a/github-search-report.md b/github-search-report.md
deleted file mode 100644
index 98ec69a461..0000000000
--- a/github-search-report.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# GitHub Search Report — Hermes WebUI Fork Commits
-**Date:** 2026-05-26  
-**Searched:** `nesquena/hermes-webui` (upstream)  
-**Fork:** `someaka/hermes-webui`
-
----
-
-## Commit `4f6cc97e` — `fix: update opencode-go base_url in provider overlap tests`
-
-Changes `api.opencode.ai/go/v1` → `opencode.ai/zen/go/v1` in `tests/test_issue1894_provider_overlap.py` (5 lines).
-
-### Issues mentioning (5 found, all CLOSED):
-
-| # | Title | State | Link |
-|---|-------|-------|------|
-| **#1894** | 401 error via opencode go deepseek model | CLOSED (2026-05-13) | [link](https://github.com/nesquena/hermes-webui/issues/1894) |
-| **#772** | Error: AIAgent credential_pool kwarg | CLOSED | [link](https://github.com/nesquena/hermes-webui/issues/772) |
-| **#794** | Response shows HTML from Opencode (followup to #772) | CLOSED | [link](https://github.com/nesquena/hermes-webui/issues/794) |
-| **#850** | Unable to send request to opencode model (followup to #772/#794) | CLOSED | [link](https://github.com/nesquena/hermes-webui/issues/850) |
-| **#2518** | New Conversation button unresponsive during cold model catalog | CLOSED | [link](https://github.com/nesquena/hermes-webui/issues/2518) |
-
-### PRs mentioning (3 found):
-
-| # | Title | State | Link |
-|---|-------|-------|------|
-| **#2204** | **Fix opencode-go custom provider overlap routing** | MERGED | [link](https://github.com/nesquena/hermes-webui/pull/2204) |
-| **#2209** | stage-350: medium-risk batch (includes #2204) | MERGED | [link](https://github.com/nesquena/hermes-webui/pull/2209) |
-| **#2179** | fix(config): preserve nvidia/ prefix on NVIDIA NIM | MERGED | [link](https://github.com/nesquena/hermes-webui/pull/2179) |
-
-### Key finding:
-
-**PR #2204** is the origin of `tests/test_issue1894_provider_overlap.py` — it was the actual fix for Issue #1894. Our fork's commit `4f6cc97e` only updated stale test assertions (the base_url string) to match the canonical URL already used in the upstream source code (`api/config.py`). The source code was already correct — only the test needed the sync.
-
----
-
-## Commit `d7a915dd` — `Merge remote-tracking branch 'upstream/master'`
-
-No mentions found. This is a standard merge commit syncing with upstream.
-
----
-
-## Commit `835fb746` — `chore: clean up test_issue1894_provider_overlap — remove vestigial noqa, add docstrings`
-
-No mentions found (created locally, pushed to fork only).
-
----
-
-## Conclusion
-
-- **Zero** issues/PRs directly reference the `someaka/hermes-webui` fork
-- The upstream source code was already correct — our fork commit is a test-only sync
-- PR #2204 is the origin of the test file; our change keeps it aligned
-- All related upstream issues are CLOSED and the fix is MERGED

From 79f526b1b21c08c85fcff64f9fc00361e3f49871 Mon Sep 17 00:00:00 2001
From: Ed 
Date: Sun, 31 May 2026 02:12:03 +0200
Subject: [PATCH 321/349] fix(helpers): use ssl.SSLError instead of broad
 OSError in disconnect tuple
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OSError is too broad — it masks real errors like file-not-found.
ssl.SSLError specifically catches SSL-level disconnects without
swallowing unrelated OSError subtypes.

Closes the test_excludes_broad_oserror CI failure.
---
 api/helpers.py                                 | 7 ++-----
 tests/test_broken_pipe_cascade.py              | 9 +++++++++
 tests/test_session_lost_response_regression.py | 3 ++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/api/helpers.py b/api/helpers.py
index d51f518cf1..e9abdbc1b0 100644
--- a/api/helpers.py
+++ b/api/helpers.py
@@ -4,6 +4,7 @@
 import json as _json
 import os
 import re as _re
+import ssl
 from pathlib import Path
 from api.config import IMAGE_EXTS, MD_EXTS
 
@@ -11,16 +12,12 @@
 # Treat stalled/closed HTTP clients as normal disconnects.  Long-lived SSE
 # connections often end this way when a browser tab sleeps, a phone switches
 # networks, or Tailscale leaves the socket half-closed.
-#
-# ssl.SSLError subclasses OSError, so the bare OSError arm already catches
-# SSL-level disconnects.  We keep OSError explicitly for socket-level errors
-# (errno 32 EPIPE, 54 ECONNRESET, 104 ECONNABORTED, 110 ETIMEDOUT).
 _CLIENT_DISCONNECT_ERRORS = (
     BrokenPipeError,
     ConnectionResetError,
     ConnectionAbortedError,
     TimeoutError,
-    OSError,
+    ssl.SSLError,
 )
 
 
diff --git a/tests/test_broken_pipe_cascade.py b/tests/test_broken_pipe_cascade.py
index a1e2c1b04a..88a09ac76c 100644
--- a/tests/test_broken_pipe_cascade.py
+++ b/tests/test_broken_pipe_cascade.py
@@ -226,11 +226,14 @@ def _fake_handle_get(self, parsed):
         # Patch handle_get to raise BrokenPipeError
         import server as _server_mod
         orig_handle_get = _server_mod.handle_get
+        orig_check_auth = _server_mod.check_auth
         _server_mod.handle_get = _fake_handle_get
+        _server_mod.check_auth = lambda h, p: True
         try:
             Handler.do_GET(handler)
         finally:
             _server_mod.handle_get = orig_handle_get
+            _server_mod.check_auth = orig_check_auth
 
         # send_response should NEVER be called for the 500 — client is gone
         handler.send_response.assert_not_called()
@@ -284,11 +287,14 @@ def _fake_handle_get(self, parsed):
 
         import server as _server_mod
         orig_handle_get = _server_mod.handle_get
+        orig_check_auth = _server_mod.check_auth
         _server_mod.handle_get = _fake_handle_get
+        _server_mod.check_auth = lambda h, p: True
         try:
             Handler.do_GET(handler)
         finally:
             _server_mod.handle_get = orig_handle_get
+            _server_mod.check_auth = orig_check_auth
 
         handler.send_response.assert_not_called()
 
@@ -302,11 +308,14 @@ def _fake_handle_get(self, parsed):
 
         import server as _server_mod
         orig_handle_get = _server_mod.handle_get
+        orig_check_auth = _server_mod.check_auth
         _server_mod.handle_get = _fake_handle_get
+        _server_mod.check_auth = lambda h, p: True
         try:
             Handler.do_GET(handler)
         finally:
             _server_mod.handle_get = orig_handle_get
+            _server_mod.check_auth = orig_check_auth
 
         handler.send_response.assert_not_called()
 
diff --git a/tests/test_session_lost_response_regression.py b/tests/test_session_lost_response_regression.py
index 9f8b63c729..f0d562913d 100644
--- a/tests/test_session_lost_response_regression.py
+++ b/tests/test_session_lost_response_regression.py
@@ -326,7 +326,8 @@ def test_messages_js_names_browser_sse_disconnect_separately():
 def test_server_treats_broken_pipe_as_client_disconnect_not_500():
     server_py = (models.Path(__file__).parent.parent / "server.py").read_text(encoding="utf-8")
 
-    assert "except (BrokenPipeError, ConnectionResetError, ConnectionAbortedError):" in server_py
+    # server.py now uses the centralized _CLIENT_DISCONNECT_ERRORS tuple from api.helpers
+    assert "_CLIENT_DISCONNECT_ERRORS" in server_py
     assert "do not convert it into a misleading server 500" in server_py
 
 

From c4d845c9d591fa8b640b7ccda0241ea6877cc69f Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sun, 31 May 2026 01:35:12 +0000
Subject: [PATCH 322/349] =?UTF-8?q?docs(CHANGELOG):=20v0.51.182=20?=
 =?UTF-8?q?=E2=80=94=20consolidated=20client-disconnect=20handling=20(#321?=
 =?UTF-8?q?0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a17485683d..9feb92f106 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,8 +3,13 @@
 
 ## [Unreleased]
 
+## [v0.51.182] — 2026-05-31 — Release FB (stage-batchB2 — headless browser smoke gate + consolidated client-disconnect handling)
+
 ### Added
-- CI now runs a headless browser smoke test (`tests/browser_smoke.py`, `.github/workflows/browser-smoke.yml`) on every PR and push: it boots the real server agent-free and loads the key pages in Chromium, failing on any console error or uncaught JS exception. This catches the runtime-JS brick class (e.g. a `const` reassigned at runtime as in #3162, or a `function`/`window` name collision as in #2715/#2771) that `node --check`, ESLint, and the mocked test suite cannot see because they only manifest when a real browser executes the page. The smoke is credential-free — it strips `*_API_KEY` from the environment and drives no real model.
+- CI now runs a headless browser smoke test (`tests/browser_smoke.py`, `.github/workflows/browser-smoke.yml`) on every PR and push: it boots the real server agent-free and loads the key pages in Chromium, failing on any console error or uncaught JS exception. This catches the runtime-JS brick class (e.g. a `const` reassigned at runtime as in #3162, or a `function`/`window` name collision as in #2715/#2771) that `node --check`, ESLint, and the mocked test suite cannot see because they only manifest when a real browser executes the page. The smoke is credential-free — it strips `*_API_KEY` from the environment and drives no real model (#3231).
+
+### Fixed
+- Client disconnects during response writes (browser tab close, SSE reconnect races, mobile network switches, half-closed sockets) are now handled through a single `_CLIENT_DISCONNECT_ERRORS` set and a `_safe_write` helper instead of ad-hoc per-call-site `try/except`, so an expected disconnect no longer surfaces as a misleading server 500 in the logs. The error-response path is itself wrapped so a disconnect while sending a 500 is swallowed quietly rather than cascading. A bare `TimeoutError` from the Joplin notes integration's `urlopen` is now converted to a clean "not reachable" error at the route rather than escaping to the dispatch-level disconnect handler (#3210).
 
 ## [v0.51.181] — 2026-05-30 — Release FA (stage-batchA — agent-cache eviction teardown + streaming finalize race)
 

From dca4a2a7af3fd3e299e2db5ae9132607d7ac8d68 Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sun, 31 May 2026 01:49:44 +0000
Subject: [PATCH 323/349] fix(#3210 review): convert bare urlopen TimeoutError
 to ValueError in _joplin_api_get
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Codex+Opus pre-release gate both flagged: TimeoutError is now in the
consolidated _CLIENT_DISCONNECT_ERRORS dispatch set, so a bare socket-connect
TimeoutError from Joplins urlopen(timeout=8) — which is NOT always URLError-
wrapped — would escape _handle_notes_search and be swallowed by the dispatch
disconnect handler as a fake client disconnect (silent empty response, no log).
Catch (URLError, TimeoutError) at the route so it surfaces as a clean
"not reachable" ValueError -> JSON error. Adds a regression test.

Co-authored-by: someaka 
---
 api/routes.py                     |  8 +++++++-
 tests/test_webui_notes_sources.py | 24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/api/routes.py b/api/routes.py
index 16ac8297cc..74d1574095 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -13276,7 +13276,13 @@ def _joplin_api_get(path: str, params: dict | None = None) -> dict:
             raw = response.read(2_000_000).decode("utf-8", errors="replace")
     except HTTPError as exc:
         raise ValueError(f"Joplin API returned HTTP {exc.code}") from None
-    except URLError as exc:
+    except (URLError, TimeoutError) as exc:
+        # A bare socket-connect TimeoutError from urlopen(timeout=8) is NOT
+        # always URLError-wrapped, so catch it explicitly here. Otherwise it
+        # propagates past _handle_notes_search's `except ValueError` to the
+        # request dispatch, where the consolidated client-disconnect handler
+        # (#3210) would swallow it as a fake disconnect — silent empty response,
+        # no log. Convert it to a normal "not reachable" ValueError instead.
         raise ValueError("Joplin API is not reachable") from None
     try:
         data = json.loads(raw)
diff --git a/tests/test_webui_notes_sources.py b/tests/test_webui_notes_sources.py
index bac05eb58d..f70d4d1353 100644
--- a/tests/test_webui_notes_sources.py
+++ b/tests/test_webui_notes_sources.py
@@ -138,6 +138,30 @@ def fake_get(path, params=None):
     assert "Preview truncated" in note["body"]
 
 
+def test_joplin_api_get_converts_bare_timeout_to_valueerror(monkeypatch):
+    """Regression (#3210 review): a bare socket TimeoutError from urlopen must
+    surface as a ValueError, not propagate.
+
+    `urlopen(timeout=8)` can raise a bare ``TimeoutError`` (not URLError-wrapped)
+    on a slow/unreachable Joplin server. After the consolidated client-disconnect
+    handling landed, ``TimeoutError`` is in the request dispatch's
+    ``_CLIENT_DISCONNECT_ERRORS`` set — so if it escaped ``_joplin_api_get`` it
+    would be swallowed as a fake client disconnect (silent empty response, no
+    log). It must be converted to a "not reachable" ValueError at the route.
+    """
+    import pytest
+    from api import routes
+
+    def fake_urlopen(request, timeout):
+        raise TimeoutError("timed out")
+
+    monkeypatch.setattr(routes, "_joplin_connection_from_config", lambda: ("http://127.0.0.1:41184", "secret-token"))
+    monkeypatch.setattr("urllib.request.urlopen", fake_urlopen)
+
+    with pytest.raises(ValueError, match="not reachable"):
+        routes._joplin_api_get("/search", {"query": "hello world"})
+
+
 def test_joplin_api_get_sends_header_and_query_token_for_clip_search_compat(monkeypatch):
     from api import routes
 

From aae3b418f0f9aa52521c67edde2a6130ca8874fe Mon Sep 17 00:00:00 2001
From: AJV20 <24819659+AJV20@users.noreply.github.com>
Date: Sat, 30 May 2026 20:11:45 -0400
Subject: [PATCH 324/349] fix: render file artifact links as media

---
 CHANGELOG.md               |  8 ++++++++
 static/ui.js               | 21 ++++++++++++++++++++-
 tests/test_media_inline.py |  9 +++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9feb92f106..8d7f61e14a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@
 
 ## [Unreleased]
 
+## [v0.51.183] — 2026-05-31 — Release FC (stage-batchC — inline file:// media artifacts + /api/media state-file confinement)
+
+### Fixed
+- Render assistant-emitted `file://` image artifact links inline through the authenticated `/api/media` route, so browser clients can view generated local images instead of seeing unusable server-local file paths. Only bare (line-start or whitespace-delimited) `file://` URLs are rewritten — `[label](file://...)` markdown anchors keep the normal link path (#3219).
+
+### Security
+- `/api/media` now hard-denies WebUI state and secret/config files even when they fall under an allowed root (the WebUI state dir, `settings.json`, `state.db`, `auth.json`, `auth.lock`, `config.yaml`, `.env`, signing/PBKDF2 keys, the `sessions`/`memories`/`profiles` state subdirs). Previously the whole Hermes home was an allowed root, so an authenticated session viewing attacker-influenced agent output that emitted a `file://`/`MEDIA:` link to such a file could fetch it. Hardened the boundary at the route for every entry path (bare `file://`, markdown anchors, and `MEDIA:` tokens), closing #3234.
+
 ## [v0.51.182] — 2026-05-31 — Release FB (stage-batchB2 — headless browser smoke gate + consolidated client-disconnect handling)
 
 ### Added
diff --git a/static/ui.js b/static/ui.js
index 4ca46c0f9b..94aeabe5fe 100644
--- a/static/ui.js
+++ b/static/ui.js
@@ -3014,6 +3014,16 @@ function renderMd(raw){
     media_stash.push(raw_ref);
     return '\x00D'+(media_stash.length-1)+'\x00';
   });
+  // Some gateway/tool surfaces still emit file:// links for local artifacts
+  // instead of MEDIA: tokens. Browser clients cannot open the server's
+  // filesystem directly, so treat bare file:// URLs as media artifacts and
+  // route them through /api/media. This intentionally runs only for bare URLs
+  // (line-start or whitespace-delimited), not inside markdown links, so normal
+  // [label](file://...) anchors continue to use the link path below.
+  s=s.replace(/(^|\s)(file:\/\/[^\s<>"')\]]+)/g,(_,lead,raw_ref)=>{
+    media_stash.push(raw_ref);
+    return lead+'\x00D'+(media_stash.length-1)+'\x00';
+  });
   // ── End MEDIA stash ─────────────────────────────────────────────────────────
   // Pre-pass: decode HTML entities first so markdown processing works correctly.
   // This prevents double-escaping when LLM outputs entities like < > &
@@ -3449,7 +3459,7 @@ function renderMd(raw){
   s=s.replace(/\x00E(\d+)\x00/g,(_,i)=>_pre_stash[+i]);
   // ── Restore MEDIA stash → inline images or download links ─────────────────
   s=s.replace(/\x00D(\d+)\x00/g,(_,i)=>{
-    const ref=media_stash[+i];
+    let ref=media_stash[+i];
     // Keep this logic self-contained: some tests extract renderMd() alone and
     // execute it in node, without the top-level helper functions from ui.js.
     const mediaKindForName=(name='')=>{
@@ -3468,6 +3478,15 @@ function renderMd(raw){
         : ``;
       return `
${tag}
${safeName}
`;
     };
+    if(/^file:\/\//i.test(ref)){
+      try{
+        const u=new URL(ref);
+        ref=decodeURIComponent(u.pathname||ref.replace(/^file:\/\//i,''));
+      }catch(_){
+        try{ref=decodeURIComponent(ref.replace(/^file:\/\//i,''));}
+        catch(__){ref=ref.replace(/^file:\/\//i,'');}
+      }
+    }
     // HTTP(S) URL
     if(/^https?:\/\//i.test(ref)){
       // Rewrite localhost/127.0.0.1 to the actual server base URL so remote
diff --git a/tests/test_media_inline.py b/tests/test_media_inline.py
index 621da12051..98d195e446 100644
--- a/tests/test_media_inline.py
+++ b/tests/test_media_inline.py
@@ -41,6 +41,15 @@ def test_media_token_regex(self):
         self.assertIn("MEDIA:", UI_JS,
                       "MEDIA: token regex must be present in renderMd()")
 
+    def test_bare_file_urls_are_stashed_as_media_artifacts(self):
+        self.assertIn("file:// links for local artifacts", UI_JS)
+        self.assertIn("file:\\/\\/[^\\s<>", UI_JS)
+
+    def test_file_urls_are_rewritten_through_media_endpoint(self):
+        self.assertIn("new URL(ref)", UI_JS)
+        self.assertIn("u.pathname", UI_JS)
+        self.assertIn("api/media?path=", UI_JS)
+
     def test_media_restore_produces_img_tag(self):
         self.assertIn("msg-media-img", UI_JS,
                       "restore pass must produce ")

From 63bb2f98841cb9c352bca5a100d970c10d91df84 Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sun, 31 May 2026 02:27:15 +0000
Subject: [PATCH 325/349] fix(security #3234): /api/media hard-denies WebUI
 state + secret/config files

Pre-release dual-gate (Codex + Opus) on #3219 surfaced that /api/media serves
files under the allowlisted Hermes home, including settings.json / state.db /
auth.json / config.yaml. #3219 makes this materially worse: pre-#3219 a bare
file:// URL in agent output rendered as inert text, but #3219 turns it into an
auto-loading  that fetches on render. Rather than
weaken #3219, harden the boundary at the route: hard-deny known secret/config
filenames and the WebUI state subdirs (sessions/memories/profiles + STATE_DIR)
before the allow/serve decision, covering every entry path (bare file://,
markdown anchors, MEDIA: tokens, session-token grants). Adds a live-server
regression test. Closes #3234.

Co-authored-by: AJV20 <24819659+AJV20@users.noreply.github.com>
---
 api/routes.py              | 32 ++++++++++++++++++++++++++++++
 tests/test_media_inline.py | 40 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/api/routes.py b/api/routes.py
index 74d1574095..ac8c1c11b1 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -8083,6 +8083,38 @@ def _handle_media(handler, parsed):
         target,
         _INLINE_IMAGE_TYPES,
     )
+
+    # Hard deny WebUI state + secret/config files even when they fall under an
+    # allowed root (the whole Hermes home is allowed, and the state dir lives
+    # inside it). Without this, an authenticated session rendering attacker-
+    # influenced agent output that emits a file:// / MEDIA: link to one of these
+    # paths could fetch it through /api/media. This guard runs BEFORE the
+    # allow/serve decision so it covers every entry path (bare file:// URLs,
+    # markdown anchors, MEDIA: tokens, and session-token grants). See #3234.
+    _DENY_FILENAMES = {
+        "settings.json", "state.db", "auth.json", "auth.lock",
+        "config.yaml", "config.yml", ".env", ".signing_key",
+        ".pbkdf2_key", ".sessions.json",
+    }
+    _state_dir = None
+    try:
+        from api.config import STATE_DIR as _STATE_DIR
+        _state_dir = Path(_STATE_DIR).resolve()
+    except Exception:
+        _state_dir = None
+    _deny_dirs = [d for d in (
+        _state_dir,
+        (_HERMES_HOME / "sessions").resolve(),
+        (_HERMES_HOME / "memories").resolve(),
+        (_HERMES_HOME / "profiles").resolve(),
+    ) if d is not None]
+    _denied = (
+        target.name in _DENY_FILENAMES
+        or any(_path_is_within_root(target, d) for d in _deny_dirs)
+    )
+    if _denied:
+        return bad(handler, "Path not in allowed location", 403)
+
     if not within_allowed and not session_media_allowed:
         return bad(handler, "Path not in allowed location", 403)
 
diff --git a/tests/test_media_inline.py b/tests/test_media_inline.py
index 98d195e446..b1f3ae0dde 100644
--- a/tests/test_media_inline.py
+++ b/tests/test_media_inline.py
@@ -465,6 +465,46 @@ def test_path_traversal_rejected(self):
         )
         self.assertIn(status, {403, 404})
 
+    def test_webui_state_secret_files_denied(self):
+        """#3234: /api/media must hard-deny WebUI state/secret files even though
+        they live under an allowed root (the whole Hermes home is allowed).
+
+        An authenticated session rendering attacker-influenced agent output that
+        emits a file://  or MEDIA: link to settings.json / state.db / auth.json
+        must NOT be able to fetch it through /api/media.
+        """
+        state_dir = pathlib.Path(TEST_STATE_DIR)
+        state_dir.mkdir(parents=True, exist_ok=True)
+        # settings.json by name (deny-by-filename)
+        settings = state_dir / "settings.json"
+        settings.write_text('{"secret":"value"}', encoding="utf-8")
+        try:
+            _, status, _ = self._get(
+                "/api/media?path=" + urllib.request.quote(str(settings.resolve()))
+            )
+            self.assertEqual(
+                status, 403,
+                f"settings.json under the state dir must be denied, got {status}",
+            )
+        finally:
+            settings.unlink(missing_ok=True)
+
+        # a file inside the sessions/ state subdir (deny-by-dir)
+        sess_dir = state_dir / "sessions"
+        sess_dir.mkdir(parents=True, exist_ok=True)
+        sess_file = sess_dir / "abc123.json"
+        sess_file.write_text('{"messages":[]}', encoding="utf-8")
+        try:
+            _, status, _ = self._get(
+                "/api/media?path=" + urllib.request.quote(str(sess_file.resolve()))
+            )
+            self.assertEqual(
+                status, 403,
+                f"files under the sessions/ state subdir must be denied, got {status}",
+            )
+        finally:
+            sess_file.unlink(missing_ok=True)
+
     def test_health_check_still_works(self):
         """Sanity: server is up and /health works."""
         body, status, _ = self._get("/health")

From c36fda23f772bcff9c4a868f05dc8c45ae9c923f Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sun, 31 May 2026 02:32:16 +0000
Subject: [PATCH 326/349] test: widen _handle_media CSP-slice window to 7000
 after #3234 deny-list insertion

---
 tests/test_issue1800_file_html_interactions.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/test_issue1800_file_html_interactions.py b/tests/test_issue1800_file_html_interactions.py
index 995c24be00..00edbef74b 100644
--- a/tests/test_issue1800_file_html_interactions.py
+++ b/tests/test_issue1800_file_html_interactions.py
@@ -68,10 +68,12 @@ def test_html_media_open_full_uses_inline_new_tab_not_download():
 
 def test_media_html_inline_keeps_csp_sandbox():
     """api/media may serve HTML inline only behind a CSP sandbox."""
-    # Slice widened to 5000 (was 4000) after PR #2044 added MEDIA_ALLOWED_ROOTS
-    # parsing earlier in _handle_media, which pushed the CSP block past the
-    # original window. The assertion is structural, not positional.
-    body = _slice_after(ROUTES_PY, "def _handle_media", 5000)
+    # Slice widened to 7000 (was 5000) after the #3234 security deny-list block
+    # was inserted earlier in _handle_media, pushing the CSP block further down
+    # (the `csp=csp` line now sits ~6050 chars past the def). (Previously widened
+    # 4000→5000 for PR #2044's MEDIA_ALLOWED_ROOTS parsing.) The assertion is
+    # structural, not positional.
+    body = _slice_after(ROUTES_PY, "def _handle_media", 7000)
     assert 'html_inline_ok = inline_preview and mime == "text/html"' in body
     assert 'csp = "sandbox allow-scripts" if html_inline_ok else None' in body
     assert "csp=csp" in body

From 68a6099eafdf481d0e7ed75d83d4fec1661390d3 Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sun, 31 May 2026 02:39:46 +0000
Subject: [PATCH 327/349] fix(security #3234): harden /api/media deny-list
 (Codex review)

- Add state.db-wal / state.db-shm (SQLite sidecars carry the same data as state.db)
- Add google_token.json / google_client_secret.json (OAuth creds)
- Scope filename-based denies to files under HERMES_HOME / STATE_DIR so a
  legitimate workspace or /tmp media artifact named settings.json / config.yaml
  is not wrongly blocked.
Dir-based denies (state subdirs) remain unconditional.
---
 api/routes.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/api/routes.py b/api/routes.py
index ac8c1c11b1..63d9368d3d 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -8092,24 +8092,34 @@ def _handle_media(handler, parsed):
     # allow/serve decision so it covers every entry path (bare file:// URLs,
     # markdown anchors, MEDIA: tokens, and session-token grants). See #3234.
     _DENY_FILENAMES = {
-        "settings.json", "state.db", "auth.json", "auth.lock",
-        "config.yaml", "config.yml", ".env", ".signing_key",
-        ".pbkdf2_key", ".sessions.json",
+        "settings.json", "state.db", "state.db-wal", "state.db-shm",
+        "auth.json", "auth.lock", "config.yaml", "config.yml", ".env",
+        ".signing_key", ".pbkdf2_key", ".sessions.json",
+        "google_token.json", "google_client_secret.json",
     }
+    # Roots whose contents are sensitive in their entirety.
     _state_dir = None
     try:
         from api.config import STATE_DIR as _STATE_DIR
         _state_dir = Path(_STATE_DIR).resolve()
     except Exception:
         _state_dir = None
+    _hermes_home_resolved = _HERMES_HOME.resolve()
     _deny_dirs = [d for d in (
         _state_dir,
         (_HERMES_HOME / "sessions").resolve(),
         (_HERMES_HOME / "memories").resolve(),
         (_HERMES_HOME / "profiles").resolve(),
     ) if d is not None]
+    # Filename-based denies only apply to files living under a Hermes/WebUI state
+    # root — so a legitimate workspace or /tmp media artifact that happens to be
+    # named settings.json / config.yaml is NOT blocked (Codex review #3234).
+    _under_state_root = (
+        _path_is_within_root(target, _hermes_home_resolved)
+        or (_state_dir is not None and _path_is_within_root(target, _state_dir))
+    )
     _denied = (
-        target.name in _DENY_FILENAMES
+        (_under_state_root and target.name in _DENY_FILENAMES)
         or any(_path_is_within_root(target, d) for d in _deny_dirs)
     )
     if _denied:

From c514b32f61d599aa621b48596945c9f36786ecaa Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sun, 31 May 2026 02:45:17 +0000
Subject: [PATCH 328/349] fix(security #3234): cover ALL Hermes roots in
 /api/media deny-list (Codex review #2)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Under a named profile, process HERMES_HOME is ~/.hermes/profiles/ but the
allowlist still grants base ~/.hermes — so the prior deny (anchored only on the
active-profile root + STATE_DIR) left ~/.hermes/state.db and sibling-profile
secrets (~/.hermes/profiles/other/auth.json) reachable. Build deny roots from
every Hermes state root the allowlist accepts: active HERMES_HOME, base ~/.hermes,
api.profiles._DEFAULT_HERMES_HOME, and STATE_DIR; apply the state-subdir dir-denies
under each. Widen the CSP-slice structural test window to match.
---
 api/routes.py                                 | 43 ++++++++++++++-----
 .../test_issue1800_file_html_interactions.py  | 11 ++---
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/api/routes.py b/api/routes.py
index 63d9368d3d..633050d4ec 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -8097,26 +8097,49 @@ def _handle_media(handler, parsed):
         ".signing_key", ".pbkdf2_key", ".sessions.json",
         "google_token.json", "google_client_secret.json",
     }
-    # Roots whose contents are sensitive in their entirety.
+    # Roots whose contents are sensitive in their entirety. Cover EVERY Hermes
+    # state root that the allowlist accepts — not just the active-profile
+    # HERMES_HOME. Under a named profile the process HERMES_HOME is
+    # ~/.hermes/profiles/, but the allowlist (above) also grants the base
+    # ~/.hermes, so without including the base root an attacker-influenced link
+    # could still fetch ~/.hermes/state.db or a SIBLING profile's secrets
+    # (~/.hermes/profiles/other/auth.json). (Codex review #3234.)
     _state_dir = None
     try:
         from api.config import STATE_DIR as _STATE_DIR
         _state_dir = Path(_STATE_DIR).resolve()
     except Exception:
         _state_dir = None
-    _hermes_home_resolved = _HERMES_HOME.resolve()
-    _deny_dirs = [d for d in (
+    _base_hermes_home = None
+    try:
+        from api.profiles import _DEFAULT_HERMES_HOME as _BASE_HH
+        _base_hermes_home = Path(_BASE_HH).resolve()
+    except Exception:
+        _base_hermes_home = None
+    # All Hermes state roots: active-profile HERMES_HOME, base ~/.hermes,
+    # api.profiles default home, and the WebUI STATE_DIR.
+    _hermes_roots = []
+    for _r in (
+        _HERMES_HOME.resolve(),
+        (_HOME / ".hermes").resolve(),
+        _base_hermes_home,
         _state_dir,
-        (_HERMES_HOME / "sessions").resolve(),
-        (_HERMES_HOME / "memories").resolve(),
-        (_HERMES_HOME / "profiles").resolve(),
-    ) if d is not None]
+    ):
+        if _r is not None and _r not in _hermes_roots:
+            _hermes_roots.append(_r)
+    # Dir-based denies: the named state subdirs under every Hermes root, plus
+    # the STATE_DIR itself (sensitive in its entirety).
+    _deny_dirs = []
+    if _state_dir is not None:
+        _deny_dirs.append(_state_dir)
+    for _root in _hermes_roots:
+        for _sub in ("sessions", "memories", "profiles"):
+            _deny_dirs.append((_root / _sub).resolve())
     # Filename-based denies only apply to files living under a Hermes/WebUI state
     # root — so a legitimate workspace or /tmp media artifact that happens to be
     # named settings.json / config.yaml is NOT blocked (Codex review #3234).
-    _under_state_root = (
-        _path_is_within_root(target, _hermes_home_resolved)
-        or (_state_dir is not None and _path_is_within_root(target, _state_dir))
+    _under_state_root = any(
+        _path_is_within_root(target, _root) for _root in _hermes_roots
     )
     _denied = (
         (_under_state_root and target.name in _DENY_FILENAMES)
diff --git a/tests/test_issue1800_file_html_interactions.py b/tests/test_issue1800_file_html_interactions.py
index 00edbef74b..df1190ed94 100644
--- a/tests/test_issue1800_file_html_interactions.py
+++ b/tests/test_issue1800_file_html_interactions.py
@@ -68,12 +68,13 @@ def test_html_media_open_full_uses_inline_new_tab_not_download():
 
 def test_media_html_inline_keeps_csp_sandbox():
     """api/media may serve HTML inline only behind a CSP sandbox."""
-    # Slice widened to 7000 (was 5000) after the #3234 security deny-list block
-    # was inserted earlier in _handle_media, pushing the CSP block further down
-    # (the `csp=csp` line now sits ~6050 chars past the def). (Previously widened
+    # Slice widened to 9000 (was 5000) after the #3234 security deny-list block
+    # (multi-profile-aware deny roots) was inserted earlier in _handle_media,
+    # pushing the CSP block to ~7800 chars past the def. (Previously widened
     # 4000→5000 for PR #2044's MEDIA_ALLOWED_ROOTS parsing.) The assertion is
-    # structural, not positional.
-    body = _slice_after(ROUTES_PY, "def _handle_media", 7000)
+    # structural, not positional — generous headroom avoids re-breaking on small
+    # future edits to the early part of _handle_media.
+    body = _slice_after(ROUTES_PY, "def _handle_media", 9000)
     assert 'html_inline_ok = inline_preview and mime == "text/html"' in body
     assert 'csp = "sandbox allow-scripts" if html_inline_ok else None' in body
     assert "csp=csp" in body

From 343bad726394150166dfa29e2658703af115f8cc Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sun, 31 May 2026 02:55:53 +0000
Subject: [PATCH 329/349] fix(security #3234): redesign /api/media deny with
 active-workspace carve-out (Codex review #3)

Codex round-3 found the prior multi-profile hardening OVER-blocked: denying
STATE_DIR + base/profiles wholesale 403'd legitimate active-workspace media.
Redesign around a single principle: the ACTIVE WORKSPACE is the user's own
content (never deny), Hermes INTERNAL STATE lives outside any workspace (deny).
If target is inside the active workspace -> allow; else deny known secret/config
basenames + internal state subdirs across all Hermes roots. Also folds in Opus
defense-in-depth: adds cron/logs/checkpoints/backups subdirs +
gateway_state.json/channel_directory.json/jobs.json basenames. Adds an
over-block regression test (a /tmp artifact named settings_* still serves 200).
---
 api/routes.py              | 92 +++++++++++++++++++++++---------------
 tests/test_media_inline.py | 33 ++++++++++++++
 2 files changed, 90 insertions(+), 35 deletions(-)

diff --git a/api/routes.py b/api/routes.py
index 633050d4ec..21db2702d3 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -8084,26 +8084,35 @@ def _handle_media(handler, parsed):
         _INLINE_IMAGE_TYPES,
     )
 
-    # Hard deny WebUI state + secret/config files even when they fall under an
-    # allowed root (the whole Hermes home is allowed, and the state dir lives
-    # inside it). Without this, an authenticated session rendering attacker-
-    # influenced agent output that emits a file:// / MEDIA: link to one of these
-    # paths could fetch it through /api/media. This guard runs BEFORE the
-    # allow/serve decision so it covers every entry path (bare file:// URLs,
-    # markdown anchors, MEDIA: tokens, and session-token grants). See #3234.
+    # ── #3234: hard-deny Hermes's own state + secret/config files ────────────
+    # The allowlist above grants the whole Hermes home (and base ~/.hermes), so
+    # an authenticated session rendering attacker-influenced agent output that
+    # emits a file:// / MEDIA: link to a state/secret file could fetch it
+    # through /api/media. This guard runs BEFORE the allow/serve decision so it
+    # covers every entry path (bare file:// URLs, markdown anchors, MEDIA:
+    # tokens, and session-token grants).
+    #
+    # Model: the ACTIVE WORKSPACE is a legitimate-media carve-out — the user is
+    # entitled to their own workspace files (that is also how the workspace file
+    # browser reaches them), even when a workspace happens to live under a
+    # Hermes root. The deny rules target Hermes's OWN internal state, which lives
+    # OUTSIDE any workspace. So: if the target is inside the active workspace, it
+    # is never denied here; otherwise we deny known secret/config basenames and
+    # the internal state subdirectories across every Hermes root the allowlist
+    # accepts (active-profile HERMES_HOME, base ~/.hermes, the api.profiles
+    # default home, and STATE_DIR — which also defends sibling profiles).
     _DENY_FILENAMES = {
         "settings.json", "state.db", "state.db-wal", "state.db-shm",
         "auth.json", "auth.lock", "config.yaml", "config.yml", ".env",
         ".signing_key", ".pbkdf2_key", ".sessions.json",
         "google_token.json", "google_client_secret.json",
+        "gateway_state.json", "channel_directory.json", "jobs.json",
     }
-    # Roots whose contents are sensitive in their entirety. Cover EVERY Hermes
-    # state root that the allowlist accepts — not just the active-profile
-    # HERMES_HOME. Under a named profile the process HERMES_HOME is
-    # ~/.hermes/profiles/, but the allowlist (above) also grants the base
-    # ~/.hermes, so without including the base root an attacker-influenced link
-    # could still fetch ~/.hermes/state.db or a SIBLING profile's secrets
-    # (~/.hermes/profiles/other/auth.json). (Codex review #3234.)
+    # Internal state subdirs that are sensitive in their entirety.
+    _DENY_SUBDIRS = (
+        "sessions", "memories", "profiles", "cron", "logs",
+        "checkpoints", "backups",
+    )
     _state_dir = None
     try:
         from api.config import STATE_DIR as _STATE_DIR
@@ -8116,8 +8125,6 @@ def _handle_media(handler, parsed):
         _base_hermes_home = Path(_BASE_HH).resolve()
     except Exception:
         _base_hermes_home = None
-    # All Hermes state roots: active-profile HERMES_HOME, base ~/.hermes,
-    # api.profiles default home, and the WebUI STATE_DIR.
     _hermes_roots = []
     for _r in (
         _HERMES_HOME.resolve(),
@@ -8127,26 +8134,41 @@ def _handle_media(handler, parsed):
     ):
         if _r is not None and _r not in _hermes_roots:
             _hermes_roots.append(_r)
-    # Dir-based denies: the named state subdirs under every Hermes root, plus
-    # the STATE_DIR itself (sensitive in its entirety).
-    _deny_dirs = []
-    if _state_dir is not None:
-        _deny_dirs.append(_state_dir)
-    for _root in _hermes_roots:
-        for _sub in ("sessions", "memories", "profiles"):
-            _deny_dirs.append((_root / _sub).resolve())
-    # Filename-based denies only apply to files living under a Hermes/WebUI state
-    # root — so a legitimate workspace or /tmp media artifact that happens to be
-    # named settings.json / config.yaml is NOT blocked (Codex review #3234).
-    _under_state_root = any(
-        _path_is_within_root(target, _root) for _root in _hermes_roots
-    )
-    _denied = (
-        (_under_state_root and target.name in _DENY_FILENAMES)
-        or any(_path_is_within_root(target, d) for d in _deny_dirs)
+
+    # Active-workspace carve-out: a file inside the active workspace is the
+    # user's own content, not Hermes internal state — never deny it here.
+    _active_workspace = None
+    try:
+        from api.workspace import get_last_workspace
+        _aw = Path(get_last_workspace()).resolve()
+        if _aw.is_dir():
+            _active_workspace = _aw
+    except Exception:
+        _active_workspace = None
+    _in_active_workspace = (
+        _active_workspace is not None
+        and _path_is_within_root(target, _active_workspace)
     )
-    if _denied:
-        return bad(handler, "Path not in allowed location", 403)
+
+    if not _in_active_workspace:
+        _under_hermes_root = any(
+            _path_is_within_root(target, _root) for _root in _hermes_roots
+        )
+        # State-subdir deny: any DENY_SUBDIR directly under a Hermes root, and
+        # the STATE_DIR itself (sensitive in its entirety).
+        _deny_dirs = []
+        if _state_dir is not None:
+            _deny_dirs.append(_state_dir)
+        for _root in _hermes_roots:
+            for _sub in _DENY_SUBDIRS:
+                _deny_dirs.append((_root / _sub).resolve())
+        _denied = (
+            (_under_hermes_root and target.name in _DENY_FILENAMES)
+            or any(_path_is_within_root(target, d) for d in _deny_dirs)
+        )
+        if _denied:
+            return bad(handler, "Path not in allowed location", 403)
+    # ── end #3234 deny ───────────────────────────────────────────────────────
 
     if not within_allowed and not session_media_allowed:
         return bad(handler, "Path not in allowed location", 403)
diff --git a/tests/test_media_inline.py b/tests/test_media_inline.py
index b1f3ae0dde..1c68ccdd20 100644
--- a/tests/test_media_inline.py
+++ b/tests/test_media_inline.py
@@ -505,6 +505,39 @@ def test_webui_state_secret_files_denied(self):
         finally:
             sess_file.unlink(missing_ok=True)
 
+    def test_deny_list_does_not_overblock_legitimate_media(self):
+        """#3234 follow-up: the state/secret deny-list must NOT block ordinary
+        media that merely shares a sensitive basename but lives OUTSIDE any
+        Hermes state root (e.g. a user artifact in /tmp named settings.json).
+
+        The deny is scoped to files under a Hermes root; a /tmp PNG named
+        settings.png — or even settings.json — is the user's own content and
+        must still be served (200), not 403.
+        """
+        png_bytes = (
+            b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01'
+            b'\x08\x06\x00\x00\x00\x1f\x15\xc4\x89\x00\x00\x00\nIDATx\x9cc\x00'
+            b'\x01\x00\x00\x05\x00\x01\r\n-\xb4\x00\x00\x00\x00IEND\xaeB`\x82'
+        )
+        # A /tmp artifact whose stem collides with a denied basename — must serve
+        # because /tmp is not a Hermes state root.
+        with tempfile.NamedTemporaryFile(
+            suffix=".png", prefix="settings_artifact_", dir="/tmp", delete=False
+        ) as f:
+            f.write(png_bytes)
+            tmp_path = f.name
+        try:
+            body, status, headers = self._get(
+                f"/api/media?path={urllib.request.quote(tmp_path)}"
+            )
+            self.assertEqual(
+                status, 200,
+                f"a /tmp PNG outside any Hermes root must serve, got {status}",
+            )
+            self.assertIn("image/png", headers.get("Content-Type", ""))
+        finally:
+            pathlib.Path(tmp_path).unlink(missing_ok=True)
+
     def test_health_check_still_works(self):
         """Sanity: server is up and /health works."""
         body, status, _ = self._get("/health")

From 26305c2ebb33158665a7f748d9e2b6c8e824f397 Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sun, 31 May 2026 03:08:10 +0000
Subject: [PATCH 330/349] fix(security #3234): gate active-workspace carve-out
 against broad/internal roots (Codex review #4)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Codex round-4: the carve-out could re-open the hole if the active workspace is
pathologically set to a broad/internal root ($HOME, ~/.hermes, a profile root)
— get_last_workspace only checks is_dir(), so workspace=~/.hermes would serve
state.db. Gate the carve-out: disable it when the active workspace IS, CONTAINS,
or is CONTAINED BY any Hermes root, or is $HOME / a */profiles dir / a named
profile root / an internal state subdir. Adds a unit test proving state.db stays
403 when the active workspace is the Hermes home. Widen CSP-slice test window.
---
 api/routes.py                                 | 26 +++++++++++
 .../test_issue1800_file_html_interactions.py  | 14 +++---
 tests/test_media_inline.py                    | 46 +++++++++++++++++++
 3 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/api/routes.py b/api/routes.py
index 21db2702d3..75870e7c49 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -8137,6 +8137,12 @@ def _handle_media(handler, parsed):
 
     # Active-workspace carve-out: a file inside the active workspace is the
     # user's own content, not Hermes internal state — never deny it here.
+    # BUT the carve-out is only safe for a genuine PROJECT workspace. If the
+    # active workspace is pathologically set to a broad/internal root ($HOME,
+    # any Hermes root, an ancestor of a Hermes root, STATE_DIR, a */profiles
+    # dir, a named profile root, or an internal state subdir), honoring it would
+    # re-open the disclosure (e.g. workspace=~/.hermes → state.db served). In
+    # that case we DISABLE the carve-out so the deny rules below still fire.
     _active_workspace = None
     try:
         from api.workspace import get_last_workspace
@@ -8145,8 +8151,28 @@ def _handle_media(handler, parsed):
             _active_workspace = _aw
     except Exception:
         _active_workspace = None
+
+    def _workspace_is_safe_carveout(ws):
+        if ws is None:
+            return False
+        # Never trust a workspace that IS, CONTAINS, or is CONTAINED BY a Hermes
+        # root, or that is $HOME / a profiles dir / a state subdir.
+        if ws == _HOME.resolve():
+            return False
+        for _root in _hermes_roots:
+            # ws == root, ws inside root, or ws an ancestor of root → unsafe.
+            if ws == _root or _path_is_within_root(ws, _root) or _path_is_within_root(_root, ws):
+                return False
+        # A */profiles dir or a named-profile root (…/profiles/).
+        if ws.name == "profiles" or (ws.parent.name == "profiles"):
+            return False
+        if ws.name in _DENY_SUBDIRS:
+            return False
+        return True
+
     _in_active_workspace = (
         _active_workspace is not None
+        and _workspace_is_safe_carveout(_active_workspace)
         and _path_is_within_root(target, _active_workspace)
     )
 
diff --git a/tests/test_issue1800_file_html_interactions.py b/tests/test_issue1800_file_html_interactions.py
index df1190ed94..5c0e810d03 100644
--- a/tests/test_issue1800_file_html_interactions.py
+++ b/tests/test_issue1800_file_html_interactions.py
@@ -68,13 +68,13 @@ def test_html_media_open_full_uses_inline_new_tab_not_download():
 
 def test_media_html_inline_keeps_csp_sandbox():
     """api/media may serve HTML inline only behind a CSP sandbox."""
-    # Slice widened to 9000 (was 5000) after the #3234 security deny-list block
-    # (multi-profile-aware deny roots) was inserted earlier in _handle_media,
-    # pushing the CSP block to ~7800 chars past the def. (Previously widened
-    # 4000→5000 for PR #2044's MEDIA_ALLOWED_ROOTS parsing.) The assertion is
-    # structural, not positional — generous headroom avoids re-breaking on small
-    # future edits to the early part of _handle_media.
-    body = _slice_after(ROUTES_PY, "def _handle_media", 9000)
+    # Slice widened to 12000 (was 5000) after the #3234 security work landed a
+    # multi-profile-aware deny-list + active-workspace carve-out + carve-out
+    # safety gate earlier in _handle_media, pushing the CSP block to ~9850 chars
+    # past the def. (Originally widened 4000→5000 for PR #2044's
+    # MEDIA_ALLOWED_ROOTS parsing.) The assertion is structural, not positional —
+    # generous headroom avoids re-breaking on small future edits.
+    body = _slice_after(ROUTES_PY, "def _handle_media", 12000)
     assert 'html_inline_ok = inline_preview and mime == "text/html"' in body
     assert 'csp = "sandbox allow-scripts" if html_inline_ok else None' in body
     assert "csp=csp" in body
diff --git a/tests/test_media_inline.py b/tests/test_media_inline.py
index 1c68ccdd20..b04366dfd4 100644
--- a/tests/test_media_inline.py
+++ b/tests/test_media_inline.py
@@ -19,6 +19,7 @@
 from types import SimpleNamespace
 from unittest import mock
 import urllib.error
+import urllib.parse
 import urllib.request
 
 from tests._pytest_port import BASE, TEST_STATE_DIR
@@ -290,6 +291,51 @@ def test_path_is_within_root_accepts_child_path(self):
             child.write_bytes(b"png")
             self.assertTrue(routes._path_is_within_root(child.resolve(), root))
 
+    def test_active_workspace_carveout_gated_against_hermes_roots(self):
+        """#3234: the active-workspace carve-out must NOT re-open the disclosure
+        when the active workspace is pathologically set to a broad/internal root
+        ($HOME, ~/.hermes, a profile root, etc.). A state.db sitting under such a
+        workspace must still be denied (403), not served.
+        """
+        from api import routes
+
+        class _Handler:
+            def __init__(self):
+                self.status = None
+                self._buf = []
+            def send_response(self, code):
+                self.status = code
+            def send_header(self, *a, **k):
+                pass
+            def end_headers(self):
+                pass
+            class _W:
+                def write(self_inner, b):
+                    pass
+            wfile = _W()
+
+        with tempfile.TemporaryDirectory() as home:
+            hermes_home = pathlib.Path(home) / ".hermes"
+            hermes_home.mkdir(parents=True)
+            secret = hermes_home / "state.db"
+            secret.write_bytes(b"secret-state")
+            target = secret.resolve()
+
+            handler = _Handler()
+            parsed = SimpleNamespace(
+                query=f"path={urllib.parse.quote(str(target))}", path="/api/media"
+            )
+            with mock.patch.dict(os.environ, {"HERMES_HOME": str(hermes_home)}), \
+                 mock.patch.object(routes, "get_last_workspace", lambda: str(hermes_home)), \
+                 mock.patch("api.auth.is_auth_enabled", lambda: False):
+                routes._handle_media(handler, parsed)
+
+            self.assertEqual(
+                handler.status, 403,
+                "state.db must stay denied even when the active workspace IS the "
+                "Hermes home (carve-out must be gated against internal roots)",
+            )
+
     def test_media_endpoints_advertise_byte_range_support(self):
         routes_src = (REPO_ROOT / "api" / "routes.py").read_text(encoding="utf-8")
         self.assertIn("Accept-Ranges", routes_src)

From 5758d4a8272130a24fb3ecb34db0221d29c2503a Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sun, 31 May 2026 03:17:10 +0000
Subject: [PATCH 331/349] fix(security/#3234 + #3219): case-fold deny checks +
 make bare file:// rewrite code-fence-aware (Codex review #5)

1. api/routes.py: case-fold /api/media deny filename + dir containment checks
   (os.path.normcase + casefold) so STATE.DB / Sessions/ cannot bypass the
   state/secret deny on case-insensitive filesystems (macOS/Windows).
2. static/ui.js: move the bare file:// media-stash pass to run AFTER fenced-block
   and inline-code stashing, so a file:// inside a code block / backtick span
   stays literal text instead of becoming an auto-loaded . The MEDIA: stash
   keeps its first-position precedent.
Adds behavioral renderer tests (real renderMd via node) for fenced + inline code
file:// staying literal, bare file:// becoming media, and anchors keeping the
link path. Closes the last Codex review items for #3234.
---
 api/routes.py                       | 16 ++++++++++++---
 static/ui.js                        | 21 ++++++++++----------
 tests/test_renderer_js_behaviour.py | 30 +++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 13 deletions(-)

diff --git a/api/routes.py b/api/routes.py
index 75870e7c49..79bcc19f7d 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -8177,8 +8177,18 @@ def _workspace_is_safe_carveout(ws):
     )
 
     if not _in_active_workspace:
+        # Case-insensitive containment + basename compare so STATE.DB / Sessions/
+        # cannot bypass the deny on macOS/Windows filesystems (Codex review #3234).
+        def _within_ci(child, root):
+            try:
+                c = os.path.normcase(str(Path(child).resolve()))
+                r = os.path.normcase(str(Path(root).resolve()))
+                return os.path.commonpath([c, r]) == r
+            except (ValueError, OSError):
+                return False
+        _deny_names_ci = {n.casefold() for n in _DENY_FILENAMES}
         _under_hermes_root = any(
-            _path_is_within_root(target, _root) for _root in _hermes_roots
+            _within_ci(target, _root) for _root in _hermes_roots
         )
         # State-subdir deny: any DENY_SUBDIR directly under a Hermes root, and
         # the STATE_DIR itself (sensitive in its entirety).
@@ -8189,8 +8199,8 @@ def _workspace_is_safe_carveout(ws):
             for _sub in _DENY_SUBDIRS:
                 _deny_dirs.append((_root / _sub).resolve())
         _denied = (
-            (_under_hermes_root and target.name in _DENY_FILENAMES)
-            or any(_path_is_within_root(target, d) for d in _deny_dirs)
+            (_under_hermes_root and target.name.casefold() in _deny_names_ci)
+            or any(_within_ci(target, d) for d in _deny_dirs)
         )
         if _denied:
             return bad(handler, "Path not in allowed location", 403)
diff --git a/static/ui.js b/static/ui.js
index 94aeabe5fe..2fc753ecdc 100644
--- a/static/ui.js
+++ b/static/ui.js
@@ -3014,16 +3014,6 @@ function renderMd(raw){
     media_stash.push(raw_ref);
     return '\x00D'+(media_stash.length-1)+'\x00';
   });
-  // Some gateway/tool surfaces still emit file:// links for local artifacts
-  // instead of MEDIA: tokens. Browser clients cannot open the server's
-  // filesystem directly, so treat bare file:// URLs as media artifacts and
-  // route them through /api/media. This intentionally runs only for bare URLs
-  // (line-start or whitespace-delimited), not inside markdown links, so normal
-  // [label](file://...) anchors continue to use the link path below.
-  s=s.replace(/(^|\s)(file:\/\/[^\s<>"')\]]+)/g,(_,lead,raw_ref)=>{
-    media_stash.push(raw_ref);
-    return lead+'\x00D'+(media_stash.length-1)+'\x00';
-  });
   // ── End MEDIA stash ─────────────────────────────────────────────────────────
   // Pre-pass: decode HTML entities first so markdown processing works correctly.
   // This prevents double-escaping when LLM outputs entities like < > &
@@ -3101,6 +3091,17 @@ function renderMd(raw){
     return lead+'\x00P'+(_preBlock_stash.length-1)+'\x00';
   });
   s=s.replace(/`([^`\n]+)`/g,(_,c)=>{fence_stash.push(''+esc(c)+'');return '\x00F'+(fence_stash.length-1)+'\x00';});
+  // Bare file:// artifact links → media. Some gateway/tool surfaces emit bare
+  // file:// links for local artifacts instead of MEDIA: tokens; browser clients
+  // cannot open the server filesystem directly, so route them through /api/media.
+  // This runs AFTER fenced-block (\x00P) and inline-code (\x00F) stashing so a
+  // file:// inside a code block / backtick span stays literal text (#3219/#3234).
+  // Only bare URLs (line-start or whitespace-delimited) are matched, so normal
+  // [label](file://...) markdown anchors keep the link path below.
+  s=s.replace(/(^|\s)(file:\/\/[^\s<>"')\]]+)/g,(_,lead,raw_ref)=>{
+    media_stash.push(raw_ref);
+    return lead+'\x00D'+(media_stash.length-1)+'\x00';
+  });
   // Math stash: protect $$..$$ and $..$ from markdown processing
   // Runs AFTER fence_stash so backtick code spans protect their dollar-sign contents
   const math_stash=[];
diff --git a/tests/test_renderer_js_behaviour.py b/tests/test_renderer_js_behaviour.py
index 72a334859d..5c92eb7bb2 100644
--- a/tests/test_renderer_js_behaviour.py
+++ b/tests/test_renderer_js_behaviour.py
@@ -702,3 +702,33 @@ def test_h4_inline_markdown_still_processes(self, driver_path):
         assert "
bold in h4
" in out, (
             f"inline markdown inside h4 must still render: {out!r}"
         )
+
+
+class TestBareFileUrlMediaRendering:
+    """#3219/#3234: bare file:// artifact links render as media, but file://
+    inside fenced/inline code stays literal (the new pass runs AFTER code-stash)."""
+
+    def test_bare_file_url_becomes_media(self, driver_path):
+        out = _render(driver_path, "Here is the screenshot file:///tmp/shot.png done")
+        # Routed through /api/media as an inline image, not left as a raw path.
+        assert "api/media?path=" in out
+        assert "msg-media-img" in out or ".
+        assert "file:///tmp/shot.png" in out
+        assert ").
+        assert "
Date: Sun, 31 May 2026 03:24:35 +0000
Subject: [PATCH 332/349] fix(security/#3234 + #3219): unify case-folded path
 checks, fix workspace over-block, protect raw 
 (Codex review #6)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. routes.py: hoist a single case-folded path helper (_norm/_within_ci/_equal_ci)
   used for ALL deny + carve-out comparisons (consistent macOS/Windows safety).
2. routes.py: split the deny into (a) dir-based denies that ALWAYS fire (even
   inside the active workspace — so a workspace overlapping a state dir cannot
   expose sessions/memories), and (b) filename denies relaxed only by the
   carve-out. Fix the over-block: a workspace that is a proper DESCENDANT of a
   Hermes root (e.g. STATE_DIR/workspace) is a legit project workspace and keeps
   the carve-out; only a root-itself / ancestor / $HOME / profiles / state-subdir
   workspace disables it.
3. ui.js: move the bare file:// media-stash pass after the raw-
 stash too,
   so file:// inside a raw 
 block stays literal (not just fenced/inline code).
---
 api/routes.py | 91 +++++++++++++++++++++++++++------------------------
 static/ui.js  | 22 ++++++-------
 2 files changed, 60 insertions(+), 53 deletions(-)

diff --git a/api/routes.py b/api/routes.py
index 79bcc19f7d..e024532e76 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -8135,14 +8135,42 @@ def _handle_media(handler, parsed):
         if _r is not None and _r not in _hermes_roots:
             _hermes_roots.append(_r)
 
-    # Active-workspace carve-out: a file inside the active workspace is the
-    # user's own content, not Hermes internal state — never deny it here.
-    # BUT the carve-out is only safe for a genuine PROJECT workspace. If the
-    # active workspace is pathologically set to a broad/internal root ($HOME,
-    # any Hermes root, an ancestor of a Hermes root, STATE_DIR, a */profiles
-    # dir, a named profile root, or an internal state subdir), honoring it would
-    # re-open the disclosure (e.g. workspace=~/.hermes → state.db served). In
-    # that case we DISABLE the carve-out so the deny rules below still fire.
+    # Case-insensitive path helpers so STATE.DB / Sessions/ casing variants
+    # cannot bypass the deny on macOS/Windows filesystems (Codex review #3234).
+    def _norm(p):
+        return os.path.normcase(str(Path(p).resolve())).casefold()
+    def _within_ci(child, root):
+        try:
+            c, r = _norm(child), _norm(root)
+            return os.path.commonpath([c, r]) == r
+        except (ValueError, OSError):
+            return False
+    def _equal_ci(a, b):
+        try:
+            return _norm(a) == _norm(b)
+        except (ValueError, OSError):
+            return False
+
+    # State-subdir deny set: each DENY_SUBDIR directly under any Hermes root,
+    # plus STATE_DIR itself (sensitive in its entirety). These ALWAYS apply —
+    # even to a file that lives under the active workspace — so a workspace
+    # pointed at (or overlapping) a state dir cannot expose sessions/memories/etc.
+    _deny_dirs = []
+    if _state_dir is not None:
+        _deny_dirs.append(_state_dir)
+    for _root in _hermes_roots:
+        for _sub in _DENY_SUBDIRS:
+            _deny_dirs.append((_root / _sub).resolve())
+    _deny_names_ci = {n.casefold() for n in _DENY_FILENAMES}
+
+    # Active-workspace carve-out: a file inside a genuine PROJECT workspace is
+    # the user's own content, so the secret/config FILENAME denies are relaxed
+    # for it. The carve-out is DISABLED when the workspace is a broad/internal
+    # location ($HOME, a Hermes root itself, an ANCESTOR of a Hermes root, a
+    # */profiles dir, a named-profile root, or a state subdir) — honoring those
+    # would re-open the disclosure. A workspace that is a proper DESCENDANT of a
+    # Hermes root (e.g. STATE_DIR/workspace) is still a legit project workspace
+    # and keeps the carve-out. The dir-based denies above are NOT relaxed.
     _active_workspace = None
     try:
         from api.workspace import get_last_workspace
@@ -8155,16 +8183,14 @@ def _handle_media(handler, parsed):
     def _workspace_is_safe_carveout(ws):
         if ws is None:
             return False
-        # Never trust a workspace that IS, CONTAINS, or is CONTAINED BY a Hermes
-        # root, or that is $HOME / a profiles dir / a state subdir.
-        if ws == _HOME.resolve():
+        if _equal_ci(ws, _HOME):
             return False
         for _root in _hermes_roots:
-            # ws == root, ws inside root, or ws an ancestor of root → unsafe.
-            if ws == _root or _path_is_within_root(ws, _root) or _path_is_within_root(_root, ws):
+            # ws IS a root, or ws is an ANCESTOR of a root → unsafe. (A proper
+            # descendant of a root is fine — that's a normal project workspace.)
+            if _equal_ci(ws, _root) or _within_ci(_root, ws):
                 return False
-        # A */profiles dir or a named-profile root (…/profiles/).
-        if ws.name == "profiles" or (ws.parent.name == "profiles"):
+        if ws.name == "profiles" or ws.parent.name == "profiles":
             return False
         if ws.name in _DENY_SUBDIRS:
             return False
@@ -8173,36 +8199,17 @@ def _workspace_is_safe_carveout(ws):
     _in_active_workspace = (
         _active_workspace is not None
         and _workspace_is_safe_carveout(_active_workspace)
-        and _path_is_within_root(target, _active_workspace)
+        and _within_ci(target, _active_workspace)
     )
 
+    # Dir-based denies always fire (even inside the active workspace).
+    if any(_within_ci(target, d) for d in _deny_dirs):
+        return bad(handler, "Path not in allowed location", 403)
+    # Filename-based denies fire for files under a Hermes root, UNLESS the file
+    # is inside a genuine project workspace (carve-out).
     if not _in_active_workspace:
-        # Case-insensitive containment + basename compare so STATE.DB / Sessions/
-        # cannot bypass the deny on macOS/Windows filesystems (Codex review #3234).
-        def _within_ci(child, root):
-            try:
-                c = os.path.normcase(str(Path(child).resolve()))
-                r = os.path.normcase(str(Path(root).resolve()))
-                return os.path.commonpath([c, r]) == r
-            except (ValueError, OSError):
-                return False
-        _deny_names_ci = {n.casefold() for n in _DENY_FILENAMES}
-        _under_hermes_root = any(
-            _within_ci(target, _root) for _root in _hermes_roots
-        )
-        # State-subdir deny: any DENY_SUBDIR directly under a Hermes root, and
-        # the STATE_DIR itself (sensitive in its entirety).
-        _deny_dirs = []
-        if _state_dir is not None:
-            _deny_dirs.append(_state_dir)
-        for _root in _hermes_roots:
-            for _sub in _DENY_SUBDIRS:
-                _deny_dirs.append((_root / _sub).resolve())
-        _denied = (
-            (_under_hermes_root and target.name.casefold() in _deny_names_ci)
-            or any(_within_ci(target, d) for d in _deny_dirs)
-        )
-        if _denied:
+        _under_hermes_root = any(_within_ci(target, _root) for _root in _hermes_roots)
+        if _under_hermes_root and target.name.casefold() in _deny_names_ci:
             return bad(handler, "Path not in allowed location", 403)
     # ── end #3234 deny ───────────────────────────────────────────────────────
 
diff --git a/static/ui.js b/static/ui.js
index 2fc753ecdc..a002f18bc8 100644
--- a/static/ui.js
+++ b/static/ui.js
@@ -3091,17 +3091,6 @@ function renderMd(raw){
     return lead+'\x00P'+(_preBlock_stash.length-1)+'\x00';
   });
   s=s.replace(/`([^`\n]+)`/g,(_,c)=>{fence_stash.push(''+esc(c)+'');return '\x00F'+(fence_stash.length-1)+'\x00';});
-  // Bare file:// artifact links → media. Some gateway/tool surfaces emit bare
-  // file:// links for local artifacts instead of MEDIA: tokens; browser clients
-  // cannot open the server filesystem directly, so route them through /api/media.
-  // This runs AFTER fenced-block (\x00P) and inline-code (\x00F) stashing so a
-  // file:// inside a code block / backtick span stays literal text (#3219/#3234).
-  // Only bare URLs (line-start or whitespace-delimited) are matched, so normal
-  // [label](file://...) markdown anchors keep the link path below.
-  s=s.replace(/(^|\s)(file:\/\/[^\s<>"')\]]+)/g,(_,lead,raw_ref)=>{
-    media_stash.push(raw_ref);
-    return lead+'\x00D'+(media_stash.length-1)+'\x00';
-  });
   // Math stash: protect $$..$$ and $..$ from markdown processing
   // Runs AFTER fence_stash so backtick code spans protect their dollar-sign contents
   const math_stash=[];
@@ -3121,6 +3110,17 @@ function renderMd(raw){
   // backticks for multiline code and break subsequent code-box rendering.
   const rawPreStash=[];
   s=s.replace(/(]*>[\s\S]*?<\/pre>)/gi,m=>{rawPreStash.push(m);return `\x00R${rawPreStash.length-1}\x00`;});
+  // Bare file:// artifact links → media. Some gateway/tool surfaces emit bare
+  // file:// links for local artifacts instead of MEDIA: tokens; browser clients
+  // cannot open the server filesystem directly, so route them through /api/media.
+  // Runs AFTER fenced-block (\x00P), inline-code (\x00F), AND raw-
 (\x00R)
+  // stashing so a file:// inside any code/preformatted region stays literal text
+  // (#3219/#3234). Only bare URLs (line-start or whitespace-delimited) match, so
+  // normal [label](file://...) markdown anchors keep the link path below.
+  s=s.replace(/(^|\s)(file:\/\/[^\s<>"')\]]+)/g,(_,lead,raw_ref)=>{
+    media_stash.push(raw_ref);
+    return lead+'\x00D'+(media_stash.length-1)+'\x00';
+  });
   s=s.replace(/([\s\S]*?)<\/strong>/gi,(_,t)=>'**'+t+'**');
   s=s.replace(/([\s\S]*?)<\/b>/gi,(_,t)=>'**'+t+'**');
   s=s.replace(/([\s\S]*?)<\/em>/gi,(_,t)=>'*'+t+'*');

From 124044dc111e0f54fc0e8a501466a684bd58f2b6 Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sun, 31 May 2026 03:41:21 +0000
Subject: [PATCH 333/349] =?UTF-8?q?fix(security=20#3234):=20do=20not=20den?=
 =?UTF-8?q?y=20STATE=5FDIR=20wholesale=20=E2=80=94=20keep=20STATE=5FDIR/wo?=
 =?UTF-8?q?rkspace=20media=20(Codex=20review=20#7)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The default workspace lives at STATE_DIR/workspace, so denying STATE_DIR itself
403'd legitimate workspace media. STATE_DIR is already in _hermes_roots, so its
sensitive subdirs (STATE_DIR/sessions, /memories, /profiles, etc.) are still
covered by the per-root subdir loop; direct sensitive files are still caught by
the filename denies. Drop the wholesale _state_dir deny. Adds a regression test
proving STATE_DIR/workspace/shot.png serves while STATE_DIR/sessions/*.json 403s.
---
 api/routes.py              | 14 ++++----
 tests/test_media_inline.py | 68 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 6 deletions(-)

diff --git a/api/routes.py b/api/routes.py
index e024532e76..bc4f6162f5 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -8151,13 +8151,15 @@ def _equal_ci(a, b):
         except (ValueError, OSError):
             return False
 
-    # State-subdir deny set: each DENY_SUBDIR directly under any Hermes root,
-    # plus STATE_DIR itself (sensitive in its entirety). These ALWAYS apply —
-    # even to a file that lives under the active workspace — so a workspace
-    # pointed at (or overlapping) a state dir cannot expose sessions/memories/etc.
+    # State-subdir deny set: each DENY_SUBDIR directly under any Hermes root
+    # (which includes STATE_DIR — so STATE_DIR/sessions, STATE_DIR/memories,
+    # etc. are covered). These ALWAYS apply — even to a file under the active
+    # workspace — so a workspace pointed at (or overlapping) a state dir cannot
+    # expose sessions/memories/profiles/etc. We do NOT deny STATE_DIR itself
+    # wholesale: the default workspace lives at STATE_DIR/workspace, and that is
+    # legitimate user media — direct sensitive files there are still caught by
+    # the filename denies below. (Codex review #3234.)
     _deny_dirs = []
-    if _state_dir is not None:
-        _deny_dirs.append(_state_dir)
     for _root in _hermes_roots:
         for _sub in _DENY_SUBDIRS:
             _deny_dirs.append((_root / _sub).resolve())
diff --git a/tests/test_media_inline.py b/tests/test_media_inline.py
index b04366dfd4..2d4bc1b9e5 100644
--- a/tests/test_media_inline.py
+++ b/tests/test_media_inline.py
@@ -336,6 +336,74 @@ def write(self_inner, b):
                 "Hermes home (carve-out must be gated against internal roots)",
             )
 
+    def test_active_workspace_under_state_dir_serves_but_sessions_denied(self):
+        """#3234: a workspace at STATE_DIR/workspace is legitimate user media —
+        STATE_DIR/workspace/shot.png must serve (not 403), while a sibling
+        STATE_DIR/sessions/.json (internal state) must stay denied (403).
+
+        Regression for the over-block where STATE_DIR was denied wholesale.
+        """
+        from api import routes
+
+        class _Handler:
+            def __init__(self):
+                self.status = None
+                self.headers = {}
+            def send_response(self, code):
+                self.status = code
+            def send_header(self, *a, **k):
+                pass
+            def end_headers(self):
+                pass
+            class _W:
+                def write(self_inner, b):
+                    pass
+                def flush(self_inner):
+                    pass
+            wfile = _W()
+
+        png_bytes = (
+            b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01'
+            b'\x08\x06\x00\x00\x00\x1f\x15\xc4\x89\x00\x00\x00\nIDATx\x9cc\x00'
+            b'\x01\x00\x00\x05\x00\x01\r\n-\xb4\x00\x00\x00\x00IEND\xaeB`\x82'
+        )
+        with tempfile.TemporaryDirectory() as home:
+            hermes_home = pathlib.Path(home) / ".hermes"
+            state_dir = hermes_home / "webui-state"
+            ws = state_dir / "workspace"
+            sessions = state_dir / "sessions"
+            ws.mkdir(parents=True)
+            sessions.mkdir(parents=True)
+            shot = ws / "shot.png"
+            shot.write_bytes(png_bytes)
+            sess_file = sessions / "abc.json"
+            sess_file.write_text('{"messages":[]}', encoding="utf-8")
+
+            env = {
+                "HERMES_HOME": str(hermes_home),
+                "HERMES_WEBUI_STATE_DIR": str(state_dir),
+            }
+            with mock.patch.dict(os.environ, env), \
+                 mock.patch.object(routes, "get_last_workspace", lambda: str(ws)), \
+                 mock.patch("api.auth.is_auth_enabled", lambda: False), \
+                 mock.patch("api.config.STATE_DIR", state_dir):
+                # workspace media → not blocked by the #3234 deny
+                h1 = _Handler()
+                routes._handle_media(h1, SimpleNamespace(
+                    query=f"path={urllib.parse.quote(str(shot.resolve()))}&inline=1",
+                    path="/api/media"))
+                self.assertNotEqual(
+                    h1.status, 403,
+                    "STATE_DIR/workspace/shot.png must NOT be blocked (legit media)")
+                # sessions state → still denied
+                h2 = _Handler()
+                routes._handle_media(h2, SimpleNamespace(
+                    query=f"path={urllib.parse.quote(str(sess_file.resolve()))}",
+                    path="/api/media"))
+                self.assertEqual(
+                    h2.status, 403,
+                    "STATE_DIR/sessions/abc.json must stay denied (internal state)")
+
     def test_media_endpoints_advertise_byte_range_support(self):
         routes_src = (REPO_ROOT / "api" / "routes.py").read_text(encoding="utf-8")
         self.assertIn("Accept-Ranges", routes_src)

From ce7a2c14dbe34c4c83d4a054787c93fd0f8b92f4 Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sun, 31 May 2026 03:48:59 +0000
Subject: [PATCH 334/349] fix(security #3234): enumerate named-profile roots,
 drop wholesale profiles deny (Codex review #8)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Denying the whole /profiles tree 403'd legitimate named-profile workspace
media (/profiles/p1/workspace/shot.png). Fix: remove 'profiles' from
_DENY_SUBDIRS and instead enumerate each /profiles/ directory as its
own Hermes root — so each profile's sensitive subdirs (sessions/memories/cron/
logs/checkpoints/backups) + secret filenames are denied, while that profile's
workspace/ is allowed via the carve-out. Adds a regression test: named-profile
workspace media serves, profile + sibling-profile auth.json stay 403.
---
 api/routes.py                                 | 26 ++++++-
 .../test_issue1800_file_html_interactions.py  | 14 ++--
 tests/test_media_inline.py                    | 69 +++++++++++++++++++
 3 files changed, 100 insertions(+), 9 deletions(-)

diff --git a/api/routes.py b/api/routes.py
index bc4f6162f5..b5cdbda803 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -8108,9 +8108,13 @@ def _handle_media(handler, parsed):
         "google_token.json", "google_client_secret.json",
         "gateway_state.json", "channel_directory.json", "jobs.json",
     }
-    # Internal state subdirs that are sensitive in their entirety.
+    # Internal state subdirs that are sensitive in their entirety. NOTE:
+    # `profiles` is intentionally NOT here — it is a container of profile roots,
+    # each of which has its own legitimate workspace/. We instead enumerate each
+    # named-profile root below and deny ITS state subdirs, so a sibling profile's
+    # secrets are blocked without 403-ing a named-profile workspace. (#3234.)
     _DENY_SUBDIRS = (
-        "sessions", "memories", "profiles", "cron", "logs",
+        "sessions", "memories", "cron", "logs",
         "checkpoints", "backups",
     )
     _state_dir = None
@@ -8134,6 +8138,24 @@ def _handle_media(handler, parsed):
     ):
         if _r is not None and _r not in _hermes_roots:
             _hermes_roots.append(_r)
+    # Enumerate named-profile roots (/profiles/) and treat each as a
+    # Hermes root in its own right, so a sibling/other profile's sensitive subdirs
+    # + secret files are denied — WITHOUT denying the whole `profiles` container
+    # (which would block a legit named-profile workspace at
+    # /profiles//workspace/). (Codex review #3234.)
+    _profile_roots = []
+    for _root in list(_hermes_roots):
+        _profiles_dir = (_root / "profiles")
+        try:
+            if _profiles_dir.is_dir():
+                for _pchild in _profiles_dir.iterdir():
+                    if _pchild.is_dir():
+                        _pr = _pchild.resolve()
+                        if _pr not in _hermes_roots and _pr not in _profile_roots:
+                            _profile_roots.append(_pr)
+        except OSError:
+            pass
+    _hermes_roots.extend(_profile_roots)
 
     # Case-insensitive path helpers so STATE.DB / Sessions/ casing variants
     # cannot bypass the deny on macOS/Windows filesystems (Codex review #3234).
diff --git a/tests/test_issue1800_file_html_interactions.py b/tests/test_issue1800_file_html_interactions.py
index 5c0e810d03..0bee348a43 100644
--- a/tests/test_issue1800_file_html_interactions.py
+++ b/tests/test_issue1800_file_html_interactions.py
@@ -68,13 +68,13 @@ def test_html_media_open_full_uses_inline_new_tab_not_download():
 
 def test_media_html_inline_keeps_csp_sandbox():
     """api/media may serve HTML inline only behind a CSP sandbox."""
-    # Slice widened to 12000 (was 5000) after the #3234 security work landed a
-    # multi-profile-aware deny-list + active-workspace carve-out + carve-out
-    # safety gate earlier in _handle_media, pushing the CSP block to ~9850 chars
-    # past the def. (Originally widened 4000→5000 for PR #2044's
-    # MEDIA_ALLOWED_ROOTS parsing.) The assertion is structural, not positional —
-    # generous headroom avoids re-breaking on small future edits.
-    body = _slice_after(ROUTES_PY, "def _handle_media", 12000)
+    # Slice widened to 16000 (was 5000) after the #3234 security work landed a
+    # multi-profile-aware deny-list + named-profile-root enumeration +
+    # active-workspace carve-out + safety gate earlier in _handle_media, pushing
+    # the CSP block to ~12100 chars past the def. (Originally widened 4000→5000
+    # for PR #2044's MEDIA_ALLOWED_ROOTS parsing.) The assertion is structural,
+    # not positional — generous headroom avoids re-breaking on small future edits.
+    body = _slice_after(ROUTES_PY, "def _handle_media", 16000)
     assert 'html_inline_ok = inline_preview and mime == "text/html"' in body
     assert 'csp = "sandbox allow-scripts" if html_inline_ok else None' in body
     assert "csp=csp" in body
diff --git a/tests/test_media_inline.py b/tests/test_media_inline.py
index 2d4bc1b9e5..c3cad01db1 100644
--- a/tests/test_media_inline.py
+++ b/tests/test_media_inline.py
@@ -404,6 +404,75 @@ def flush(self_inner):
                     h2.status, 403,
                     "STATE_DIR/sessions/abc.json must stay denied (internal state)")
 
+    def test_named_profile_workspace_serves_but_profile_secrets_denied(self):
+        """#3234: a named-profile workspace (/profiles/p1/workspace) is
+        legitimate media and must serve, while that profile's secrets
+        (/profiles/p1/auth.json) and a SIBLING profile's secrets
+        (/profiles/other/auth.json) must stay denied (403).
+
+        Regression for the over-block where the whole `profiles` tree was denied.
+        """
+        from api import routes
+
+        class _Handler:
+            def __init__(self):
+                self.status = None
+                self.headers = {}
+            def send_response(self, code):
+                self.status = code
+            def send_header(self, *a, **k):
+                pass
+            def end_headers(self):
+                pass
+            class _W:
+                def write(self_inner, b):
+                    pass
+                def flush(self_inner):
+                    pass
+            wfile = _W()
+
+        png_bytes = (
+            b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01'
+            b'\x08\x06\x00\x00\x00\x1f\x15\xc4\x89\x00\x00\x00\nIDATx\x9cc\x00'
+            b'\x01\x00\x00\x05\x00\x01\r\n-\xb4\x00\x00\x00\x00IEND\xaeB`\x82'
+        )
+        with tempfile.TemporaryDirectory() as home:
+            base = pathlib.Path(home) / ".hermes"
+            p1_ws = base / "profiles" / "p1" / "workspace"
+            p1_ws.mkdir(parents=True)
+            (p1_ws / "shot.png").write_bytes(png_bytes)
+            p1_secret = base / "profiles" / "p1" / "auth.json"
+            p1_secret.write_text("{}", encoding="utf-8")
+            other_secret = base / "profiles" / "other" / "auth.json"
+            other_secret.parent.mkdir(parents=True)
+            other_secret.write_text("{}", encoding="utf-8")
+
+            active = base / "profiles" / "p1"  # active profile HERMES_HOME
+            with mock.patch.dict(os.environ, {"HERMES_HOME": str(active)}), \
+                 mock.patch.object(routes, "get_last_workspace", lambda: str(p1_ws)), \
+                 mock.patch("api.auth.is_auth_enabled", lambda: False), \
+                 mock.patch("api.profiles._DEFAULT_HERMES_HOME", base):
+                # named-profile workspace media → served
+                h1 = _Handler()
+                routes._handle_media(h1, SimpleNamespace(
+                    query=f"path={urllib.parse.quote(str((p1_ws / 'shot.png').resolve()))}&inline=1",
+                    path="/api/media"))
+                self.assertNotEqual(
+                    h1.status, 403,
+                    "named-profile workspace media must NOT be blocked")
+                # this profile's own secret → denied
+                h2 = _Handler()
+                routes._handle_media(h2, SimpleNamespace(
+                    query=f"path={urllib.parse.quote(str(p1_secret.resolve()))}",
+                    path="/api/media"))
+                self.assertEqual(h2.status, 403, "profile auth.json must be denied")
+                # sibling profile's secret → denied
+                h3 = _Handler()
+                routes._handle_media(h3, SimpleNamespace(
+                    query=f"path={urllib.parse.quote(str(other_secret.resolve()))}",
+                    path="/api/media"))
+                self.assertEqual(h3.status, 403, "sibling profile auth.json must be denied")
+
     def test_media_endpoints_advertise_byte_range_support(self):
         routes_src = (REPO_ROOT / "api" / "routes.py").read_text(encoding="utf-8")
         self.assertIn("Accept-Ranges", routes_src)

From d1645ff80336c51a24845b0d6f80059ba2e389b9 Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sun, 31 May 2026 03:58:19 +0000
Subject: [PATCH 335/349] fix(security #3234): deny passkeys.json +
 .passkey_challenges.json + .login_attempts.json (Codex review #9)

Codex direct probe found three more auth-state basenames under STATE_DIR that
/api/media still served: passkeys.json + .passkey_challenges.json (api/passkeys.py)
and .login_attempts.json (api/auth.py). Add them to _DENY_FILENAMES.
---
 api/routes.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/routes.py b/api/routes.py
index b5cdbda803..74f2f89425 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -8107,6 +8107,7 @@ def _handle_media(handler, parsed):
         ".signing_key", ".pbkdf2_key", ".sessions.json",
         "google_token.json", "google_client_secret.json",
         "gateway_state.json", "channel_directory.json", "jobs.json",
+        "passkeys.json", ".passkey_challenges.json", ".login_attempts.json",
     }
     # Internal state subdirs that are sensitive in their entirety. NOTE:
     # `profiles` is intentionally NOT here — it is a container of profile roots,

From a62d35a0b3d234b6ba54461716515f00c920fa02 Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sun, 31 May 2026 04:05:47 +0000
Subject: [PATCH 336/349] fix(security #3234): deny atomic-write temp
 auth/state files under Hermes roots (Codex review #10)

auth.py/passkeys.py write via tmp*..tmp sidecars then rename; deny those
suffixes (.sessions.tmp, .login_attempts.tmp, .passkeys.tmp, .passkey_challenges.tmp)
under Hermes roots so a momentary temp file can't be fetched via /api/media.
---
 api/routes.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/api/routes.py b/api/routes.py
index 74f2f89425..c989eebe34 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -8234,7 +8234,17 @@ def _workspace_is_safe_carveout(ws):
     # is inside a genuine project workspace (carve-out).
     if not _in_active_workspace:
         _under_hermes_root = any(_within_ci(target, _root) for _root in _hermes_roots)
-        if _under_hermes_root and target.name.casefold() in _deny_names_ci:
+        _name_cf = target.name.casefold()
+        # Exact secret/state basenames, plus atomic-write temp files for those
+        # (api/auth.py and api/passkeys.py write via a `tmp*..tmp` / `tmp*.tmp`
+        # sidecar then rename) — deny those suffixes too so a momentary temp file
+        # cannot be fetched. (Codex review #3234.)
+        _deny_tmp_suffixes = (".sessions.tmp", ".login_attempts.tmp",
+                              ".passkeys.tmp", ".passkey_challenges.tmp")
+        if _under_hermes_root and (
+            _name_cf in _deny_names_ci
+            or _name_cf.endswith(_deny_tmp_suffixes)
+        ):
             return bad(handler, "Path not in allowed location", 403)
     # ── end #3234 deny ───────────────────────────────────────────────────────
 

From d3b69ab98b4fb1ef809d1608991fd1f4dfcc7e2e Mon Sep 17 00:00:00 2001
From: nesquena-hermes <[email protected]>
Date: Sun, 31 May 2026 04:11:35 +0000
Subject: [PATCH 337/349] fix(security #3234): deny per-profile webui_state
 state subdirs (Codex review #11)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Per-profile WebUI state lives at /webui_state (api/workspace.py), so
/profiles//webui_state/sessions/*.json was reachable — it is not a
direct child of the profile root, so the prior deny-subdir loop missed it. Add
/webui_state/ to the deny dirs for every Hermes root. Adds a
regression assertion (profile webui_state/sessions/*.json → 403).
---
 api/routes.py              |  6 ++++++
 tests/test_media_inline.py | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/api/routes.py b/api/routes.py
index c989eebe34..fa6c755791 100644
--- a/api/routes.py
+++ b/api/routes.py
@@ -8186,6 +8186,12 @@ def _equal_ci(a, b):
     for _root in _hermes_roots:
         for _sub in _DENY_SUBDIRS:
             _deny_dirs.append((_root / _sub).resolve())
+        # Per-profile WebUI state lives at /webui_state (api/workspace.py),
+        # so its state subdirs (/webui_state/sessions, etc.) must be denied
+        # too — they are NOT direct children of . (Codex review #3234.)
+        _ws_state = (_root / "webui_state")
+        for _sub in _DENY_SUBDIRS:
+            _deny_dirs.append((_ws_state / _sub).resolve())
     _deny_names_ci = {n.casefold() for n in _DENY_FILENAMES}
 
     # Active-workspace carve-out: a file inside a genuine PROJECT workspace is
diff --git a/tests/test_media_inline.py b/tests/test_media_inline.py
index c3cad01db1..9276d9be33 100644
--- a/tests/test_media_inline.py
+++ b/tests/test_media_inline.py
@@ -472,6 +472,18 @@ def flush(self_inner):
                     query=f"path={urllib.parse.quote(str(other_secret.resolve()))}",
                     path="/api/media"))
                 self.assertEqual(h3.status, 403, "sibling profile auth.json must be denied")
+                # per-profile webui_state/sessions → denied (not a direct child of root)
+                ws_sess = active / "webui_state" / "sessions"
+                ws_sess.mkdir(parents=True, exist_ok=True)
+                ws_sess_file = ws_sess / "s1.json"
+                ws_sess_file.write_text('{"messages":[]}', encoding="utf-8")
+                h4 = _Handler()
+                routes._handle_media(h4, SimpleNamespace(
+                    query=f"path={urllib.parse.quote(str(ws_sess_file.resolve()))}",
+                    path="/api/media"))
+                self.assertEqual(
+                    h4.status, 403,
+                    "profile webui_state/sessions/*.json must be denied")
 
     def test_media_endpoints_advertise_byte_range_support(self):
         routes_src = (REPO_ROOT / "api" / "routes.py").read_text(encoding="utf-8")

From 3b852bd98aa1923affecc3b177ff2c89ea9b9ea2 Mon Sep 17 00:00:00 2001
From: zapabob 
Date: Sun, 31 May 2026 11:21:14 +0900
Subject: [PATCH 338/349] test: skip terminal cleanup collection on non-posix

---
 tests/test_terminal_process_cleanup.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/test_terminal_process_cleanup.py b/tests/test_terminal_process_cleanup.py
index a537108191..a9a056c510 100644
--- a/tests/test_terminal_process_cleanup.py
+++ b/tests/test_terminal_process_cleanup.py
@@ -5,6 +5,9 @@
 
 import pytest
 
+if os.name != "posix":
+    pytest.skip("terminal process cleanup tests require POSIX terminal support", allow_module_level=True)
+
 import api.terminal as terminal
 
 

From 60914287914dfa043f8c20ba9d10863b3a659bcc Mon Sep 17 00:00:00 2001
From: Andy Kang 
Date: Sun, 31 May 2026 11:25:52 +0900
Subject: [PATCH 339/349] fix: preserve scroll on CLI import refresh

---
 static/sessions.js                           | 11 ++++++++++-
 tests/test_session_import_cli_sse_refresh.py |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/static/sessions.js b/static/sessions.js
index 8f397fc490..874bab2b2e 100644
--- a/static/sessions.js
+++ b/static/sessions.js
@@ -2822,8 +2822,17 @@ function startGatewaySSE(){
                     if (next.length < prev) return;
                     if (prev > 0 && !_isCliImportRefreshPrefixMatch(S.messages, next)) return;
                     S.messages = next;
+                    if(S.session && S.session.session_id === activeSid){
+                      S.session.message_count = next.length;
+                      const newest = next.length ? next[next.length - 1] : null;
+                      const newestTs = Number((newest && (newest.timestamp || newest._ts)) || 0);
+                      if(newestTs){
+                        S.session.last_message_at = newestTs;
+                        S.session.updated_at = newestTs;
+                      }
+                    }
                     if(S.messages.length !== prev){
-                      renderMessages();
+                      renderMessages({preserveScroll:true});
                       if(typeof highlightCode==='function') highlightCode();
                     }
                   }
diff --git a/tests/test_session_import_cli_sse_refresh.py b/tests/test_session_import_cli_sse_refresh.py
index 6f99c73357..62b9ad7a8c 100644
--- a/tests/test_session_import_cli_sse_refresh.py
+++ b/tests/test_session_import_cli_sse_refresh.py
@@ -17,6 +17,8 @@ def test_sse_import_cli_guard_skips_shorter_transcript_overwrite():
     assert "if (next.length < prev) return;" in sse_block
     assert "if (prev > 0 && !_isCliImportRefreshPrefixMatch(S.messages, next)) return;" in sse_block
     assert "S.messages = next;" in sse_block
+    assert "S.session.message_count = next.length;" in sse_block
+    assert "renderMessages({preserveScroll:true});" in sse_block
 
 
 def test_sse_import_cli_refresh_prefix_helper_ignores_timestamps():

From 41a8b1deb0d495dc5e8b3dd406ce1ac96285e0d7 Mon Sep 17 00:00:00 2001
From: Lucas Coutinho 
Date: Thu, 28 May 2026 15:00:23 -0300
Subject: [PATCH 340/349] =?UTF-8?q?feat:=20add=20raw=20audio=20upload=20mo?=
 =?UTF-8?q?de=20=E2=80=94=20send=20audio=20as=20attachment=20instead=20of?=
 =?UTF-8?q?=20transcribing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Settings toggle in Sound section (after voice mode button)
- Mic button shows 'RAW' badge when raw audio mode is active
- Raw mode: record → pending file → send() (auto-send if textarea empty)
- Dictation mode: unchanged (transcribe → textarea)
- 12 locales with full i18n keys and translations
- 4 backend tests for upload + transcribe regression

PR: Thinking Path
- Hermes WebUI has dictation via Web Speech API / MediaRecorder → /api/transcribe
- Telegram sends raw audio as attachment, agent decides what to do
- Raw audio mode enables external STT, emotion/noise analysis, multimodal models

What Changed
- static/index.html: settingsRawAudio checkbox in Sound section
- static/boot.js: raw audio preference, send raw blob as pending file
- static/style.css: badge RAW on mic button
- static/i18n.js: 12 locales with translations
- tests/test_raw_audio_upload.py: 4 tests for upload + regressions

AI Usage
- Provider: opencode-go
- Model: deepseek-v4-flash
---
 static/boot.js                 |  46 +++++++++++++-
 static/i18n.js                 |  58 +++++++++++++++--
 static/index.html              |   7 ++
 static/style.css               |   2 +
 tests/test_raw_audio_upload.py | 113 +++++++++++++++++++++++++++++++++
 5 files changed, 218 insertions(+), 8 deletions(-)
 create mode 100644 tests/test_raw_audio_upload.py

diff --git a/static/boot.js b/static/boot.js
index 9136a02856..8a864ce3fa 100644
--- a/static/boot.js
+++ b/static/boot.js
@@ -442,6 +442,9 @@ $('btnAttach').onclick=e=>{if(e&&e.preventDefault)e.preventDefault();$('fileInpu
   const _micForceMediaRecorderKey='mic_force_mediarecorder';
   let _forceMediaRecorder=!SpeechRecognition||localStorage.getItem(_micForceMediaRecorderKey)==='1';
 
+  // Raw audio mode preference: send audio file instead of transcribing
+  let _rawAudioMode = localStorage.getItem('hermes-raw-audio-mode') === 'true';
+
   const btn=$('btnMic');
   const status=$('micStatus');
   const ta=$('msg');
@@ -461,12 +464,31 @@ $('btnAttach').onclick=e=>{if(e&&e.preventDefault)e.preventDefault();$('fileInpu
     btn.classList.toggle('recording',on);
     // Active-state title flips so the tooltip is honest about what
     // pressing the button will do (#1488).
-    _setButtonTooltip(btn, on ? t('voice_dictate_active') : t('voice_dictate'));
+    _setButtonTooltip(btn, on ? t('voice_dictate_active') : (_rawAudioMode ? t('voice_send_raw') : t('voice_dictate')));
     status.style.display=on?'':'none';
     if(statusText) statusText.textContent=on?'Listening':'Listening';
     if(!on){ _finalText=''; _prefix=''; }
   }
 
+  function _updateMicBadge(){
+    btn.classList.toggle('raw-audio-mode', _rawAudioMode);
+    if(!window._micActive){
+      _setButtonTooltip(btn, _rawAudioMode ? t('voice_send_raw') : t('voice_dictate'));
+    }
+  }
+
+  async function _sendRawAudio(blob){
+    const ext=(blob.type&&blob.type.includes('ogg'))?'ogg':'webm';
+    const file=new File([blob],`voice-input-${Date.now()}.${ext}`,{type:blob.type||`audio/${ext}`});
+    S.pendingFiles.push(file);
+    renderTray();
+    if(!ta.value.trim()){
+      send();
+    }else{
+      showToast(t('voice_raw_attached'));
+    }
+  }
+
   function _commitTranscript(text){
     const clean=(text||'').trim();
     const committed=clean
@@ -589,7 +611,7 @@ $('btnAttach').onclick=e=>{if(e&&e.preventDefault)e.preventDefault();$('fileInpu
     _isRecording=true;
     _finalText='';
     _prefix=ta.value;
-    if(recognition && !_forceMediaRecorder){
+    if(recognition && !_forceMediaRecorder && !_rawAudioMode){
       recognition.start();
       _setRecording(true);
       return;
@@ -618,7 +640,13 @@ $('btnAttach').onclick=e=>{if(e&&e.preventDefault)e.preventDefault();$('fileInpu
         const blob=new Blob(audioChunks,{type:mediaRecorder.mimeType||mimeType||'audio/webm'});
         _setRecording(false);
         _stopTracks();
-        if(blob.size){ await _transcribeBlob(blob); }
+        if(blob.size){
+          if(_rawAudioMode){
+            await _sendRawAudio(blob);
+          }else{
+            await _transcribeBlob(blob);
+          }
+        }
         else if(window._micPendingSend){
           window._micPendingSend=false;
         }
@@ -632,6 +660,18 @@ $('btnAttach').onclick=e=>{if(e&&e.preventDefault)e.preventDefault();$('fileInpu
       showToast(t('mic_denied'));
     }
   };
+
+  // Wire up the settings checkbox
+  const rawAudioCheckbox = document.getElementById('settingsRawAudio');
+  if(rawAudioCheckbox){
+    rawAudioCheckbox.checked = _rawAudioMode;
+    rawAudioCheckbox.addEventListener('change', function(){
+      _rawAudioMode = this.checked;
+      localStorage.setItem('hermes-raw-audio-mode', _rawAudioMode ? 'true' : 'false');
+      _updateMicBadge();
+    });
+  }
+  _updateMicBadge();
 })();
 window._micActive=window._micActive||false;
 window._micPendingSend=window._micPendingSend||false;
diff --git a/static/i18n.js b/static/i18n.js
index 82a68a81ac..ef0acf4f53 100644
--- a/static/i18n.js
+++ b/static/i18n.js
@@ -831,6 +831,10 @@ const LOCALES = {
     // Composer voice-mode pref (#1488)
     settings_label_voice_mode: 'Hands-free voice mode button',
     settings_desc_voice_mode: 'Show the voice-mode button (audio waveform) next to the dictation mic. Lets you speak naturally — Hermes auto-sends after a pause and reads replies aloud. Requires a browser that supports both speech recognition and TTS.',
+    settings_label_raw_audio: 'Send raw audio instead of transcribing',
+    settings_desc_raw_audio: 'Record and send the original audio file to the agent instead of converting it to text first. The agent can then transcribe it or process the raw audio (emotion, background noise, custom STT). Like Telegram\'s voice message behavior.',
+    voice_send_raw: 'Send raw audio',
+    voice_raw_attached: 'Audio attached. Press Send or type more.',
     settings_label_tts_voice: 'Voice',
     settings_desc_tts_voice: "Preferred voice. Populated from your browser's available voices.",
     settings_label_tts_rate: 'Speech rate',
@@ -2134,6 +2138,10 @@ const LOCALES = {
     // Composer voice-mode pref (#1488)
     settings_label_voice_mode: 'Pulsante modalità vocale a mani libere',
     settings_desc_voice_mode: 'Mostra il pulsante modalità vocale (forma d\'onda audio) accanto al microfono di dettatura. Ti permette di parlare naturalmente — Hermes invia automaticamente dopo una pausa e legge le risposte ad alta voce. Richiede un browser che supporti sia il riconoscimento vocale che la sintesi vocale.',
+    settings_label_raw_audio: 'Invia l\'audio originale invece di trascriverlo',
+    settings_desc_raw_audio: 'Registra e invia il file audio originale all\'agente invece di convertirlo prima in testo. L\'agente può trascriverlo o elaborare l\'audio grezzo (emozioni, rumore di fondo, STT personalizzato). Come il comportamento dei messaggi vocali di Telegram.',
+    voice_send_raw: 'Invia audio originale',
+    voice_raw_attached: 'Audio allegato. Premi Invia o aggiungi testo.',
     settings_label_tts_voice: 'Voce',
     settings_desc_tts_voice: 'Voce preferita. Popolata dalle voci disponibili nel browser.',
     settings_label_tts_rate: 'Velocità voce',
@@ -3442,6 +3450,10 @@ const LOCALES = {
     // Composer voice-mode pref (#1488)
     settings_label_voice_mode: 'ハンズフリー音声モードのボタン',
     settings_desc_voice_mode: '音声波形ボタンをディクテーションマイクの隣に表示します。発話の合間に自動送信し、返答を読み上げます。音声認識と TTS の両方をサポートするブラウザが必要です。',
+    settings_label_raw_audio: '文字起こしせずに生の音声を送信',
+    settings_desc_raw_audio: '音声をテキストに変換せず、元の音声ファイルをそのままエージェントに送信します。エージェントは文字起こしをするか、生の音声を処理（感情分析、背景ノイズ、カスタムSTT）できます。Telegramの音声メッセージと同様の動作です。',
+    voice_send_raw: '生の音声を送信',
+    voice_raw_attached: '音声を添付しました。送信するかテキストを追加してください。',
     settings_label_tts_voice: '声',
     settings_desc_tts_voice: '優先する声。ブラウザで利用可能な声から選択されます。',
     settings_label_tts_rate: '読み上げ速度',
@@ -5112,6 +5124,10 @@ const LOCALES = {
     // Composer voice-mode pref (#1488)
     settings_label_voice_mode: 'Кнопка режима свободных рук',
     settings_desc_voice_mode: 'Показывать кнопку голосового режима (аудиоволны) рядом с микрофоном диктовки. Hermes автоматически отправляет реплики после паузы и зачитывает ответы вслух. Требуется браузер с поддержкой распознавания речи и TTS.',
+    settings_label_raw_audio: 'Отправлять сырую аудиозапись вместо расшифровки',
+    settings_desc_raw_audio: 'Записывать и отправлять агенту исходный аудиофайл вместо преобразования в текст. Агент может расшифровать его или обработать сырое аудио (эмоции, фоновый шум, пользовательский STT). Как голосовые сообщения в Telegram.',
+    voice_send_raw: 'Отправить сырое аудио',
+    voice_raw_attached: 'Аудио прикреплено. Нажмите Отправить или добавьте текст.',
     settings_label_tts_voice: 'Голос',
     settings_desc_tts_voice: 'Выберите голос для синтеза речи',
     settings_label_tts_rate: 'Скорость речи',
@@ -6340,7 +6356,11 @@ const LOCALES = {
     settings_desc_tts_auto_read: 'Leer en voz alta las respuestas del asistente automáticamente',
     // Composer voice-mode pref (#1488)
     settings_label_voice_mode: 'Hands-free voice mode button',  // TODO: translate
-    settings_desc_voice_mode: 'Show the voice-mode button (audio waveform) next to the dictation mic. Lets you speak naturally — Hermes auto-sends after a pause and reads replies aloud. Requires a browser that supports both speech recognition and TTS.',  // TODO: translate
+    settings_desc_voice_mode: 'Show the voice-mode button (audio waveform) next to the dictation mic. Lets you speak naturally — Hermes auto-sends after a pause and reads replies aloud. Requires a browser that supports both speech recognition and TTS.',
+    settings_label_raw_audio: 'Send raw audio instead of transcribing',
+    settings_desc_raw_audio: 'Record and send the original audio file to the agent instead of converting it to text first. The agent can then transcribe it or process the raw audio (emotion, background noise, custom STT). Like Telegram\'s voice message behavior.',
+    voice_send_raw: 'Send raw audio',
+    voice_raw_attached: 'Audio attached. Press Send or type more.',  // TODO: translate
     settings_label_tts_voice: 'Voz',
     settings_desc_tts_voice: 'Seleccionar voz para síntesis de voz',
     settings_label_tts_rate: 'Velocidad de voz',
@@ -7582,7 +7602,11 @@ const LOCALES = {
     settings_desc_tts_auto_read: 'Assistenten-Antworten automatisch vorlesen',
     // Composer voice-mode pref (#1488)
     settings_label_voice_mode: 'Hands-free voice mode button',  // TODO: translate
-    settings_desc_voice_mode: 'Show the voice-mode button (audio waveform) next to the dictation mic. Lets you speak naturally — Hermes auto-sends after a pause and reads replies aloud. Requires a browser that supports both speech recognition and TTS.',  // TODO: translate
+    settings_desc_voice_mode: 'Show the voice-mode button (audio waveform) next to the dictation mic. Lets you speak naturally — Hermes auto-sends after a pause and reads replies aloud. Requires a browser that supports both speech recognition and TTS.',
+    settings_label_raw_audio: 'Send raw audio instead of transcribing',
+    settings_desc_raw_audio: 'Record and send the original audio file to the agent instead of converting it to text first. The agent can then transcribe it or process the raw audio (emotion, background noise, custom STT). Like Telegram\'s voice message behavior.',
+    voice_send_raw: 'Send raw audio',
+    voice_raw_attached: 'Audio attached. Press Send or type more.',  // TODO: translate
     settings_label_tts_voice: 'Stimme',
     settings_desc_tts_voice: 'Stimme für Sprachsynthese auswählen',
     settings_label_tts_rate: 'Sprechgeschwindigkeit',
@@ -8820,6 +8844,10 @@ const LOCALES = {
     // Composer voice-mode pref (#1488)
     settings_label_voice_mode: '免提语音模式按钮',
     settings_desc_voice_mode: '在听写麦克风旁显示语音模式按钮（音频波形）。让您自然说话 — Hermes 会在停顿后自动发送并朗读回复。需要支持语音识别和 TTS 的浏览器。',
+    settings_label_raw_audio: '发送原始音频而非转写为文字',
+    settings_desc_raw_audio: '录制并将原始音频文件发送给代理，而不是先转换为文本。代理可以转写它或处理原始音频（情绪、背景噪音、自定义语音识别）。类似Telegram的语音消息行为。',
+    voice_send_raw: '发送原始音频',
+    voice_raw_attached: '音频已附加。按发送或输入更多内容。',
     settings_label_tts_voice: '语音',
     settings_desc_tts_voice: '选择语音合成声音',
     settings_label_tts_rate: '语速',
@@ -10129,7 +10157,11 @@ const LOCALES = {
     settings_desc_tts_auto_read: '自動朗讀助手回覆',
     // Composer voice-mode pref (#1488)
     settings_label_voice_mode: 'Hands-free voice mode button',  // TODO: translate
-    settings_desc_voice_mode: 'Show the voice-mode button (audio waveform) next to the dictation mic. Lets you speak naturally — Hermes auto-sends after a pause and reads replies aloud. Requires a browser that supports both speech recognition and TTS.',  // TODO: translate
+    settings_desc_voice_mode: 'Show the voice-mode button (audio waveform) next to the dictation mic. Lets you speak naturally — Hermes auto-sends after a pause and reads replies aloud. Requires a browser that supports both speech recognition and TTS.',
+    settings_label_raw_audio: 'Send raw audio instead of transcribing',
+    settings_desc_raw_audio: 'Record and send the original audio file to the agent instead of converting it to text first. The agent can then transcribe it or process the raw audio (emotion, background noise, custom STT). Like Telegram\'s voice message behavior.',
+    voice_send_raw: 'Send raw audio',
+    voice_raw_attached: 'Audio attached. Press Send or type more.',  // TODO: translate
     settings_label_tts_voice: '語音',
     settings_desc_tts_voice: '選擇語音合成聲音',
     settings_label_tts_rate: '語速',
@@ -11256,7 +11288,11 @@ const LOCALES = {
     settings_desc_tts_auto_read: 'Ler automaticamente as respostas do assistente',
     // Composer voice-mode pref (#1488)
     settings_label_voice_mode: 'Hands-free voice mode button',  // TODO: translate
-    settings_desc_voice_mode: 'Show the voice-mode button (audio waveform) next to the dictation mic. Lets you speak naturally — Hermes auto-sends after a pause and reads replies aloud. Requires a browser that supports both speech recognition and TTS.',  // TODO: translate
+    settings_desc_voice_mode: 'Show the voice-mode button (audio waveform) next to the dictation mic. Lets you speak naturally — Hermes auto-sends after a pause and reads replies aloud. Requires a browser that supports both speech recognition and TTS.',
+    settings_label_raw_audio: 'Send raw audio instead of transcribing',
+    settings_desc_raw_audio: 'Record and send the original audio file to the agent instead of converting it to text first. The agent can then transcribe it or process the raw audio (emotion, background noise, custom STT). Like Telegram\'s voice message behavior.',
+    voice_send_raw: 'Send raw audio',
+    voice_raw_attached: 'Audio attached. Press Send or type more.',  // TODO: translate
     settings_label_tts_voice: 'Voz',
     settings_desc_tts_voice: 'Selecionar voz para síntese de voz',
     settings_label_tts_rate: 'Velocidade da fala',
@@ -12545,7 +12581,11 @@ const LOCALES = {
     settings_desc_tts_auto_read: '도움말 답변을 자동으로 읽어줌',
     // Composer voice-mode pref (#1488)
     settings_label_voice_mode: 'Hands-free voice mode button',  // TODO: translate
-    settings_desc_voice_mode: 'Show the voice-mode button (audio waveform) next to the dictation mic. Lets you speak naturally — Hermes auto-sends after a pause and reads replies aloud. Requires a browser that supports both speech recognition and TTS.',  // TODO: translate
+    settings_desc_voice_mode: 'Show the voice-mode button (audio waveform) next to the dictation mic. Lets you speak naturally — Hermes auto-sends after a pause and reads replies aloud. Requires a browser that supports both speech recognition and TTS.',
+    settings_label_raw_audio: 'Send raw audio instead of transcribing',
+    settings_desc_raw_audio: 'Record and send the original audio file to the agent instead of converting it to text first. The agent can then transcribe it or process the raw audio (emotion, background noise, custom STT). Like Telegram\'s voice message behavior.',
+    voice_send_raw: 'Send raw audio',
+    voice_raw_attached: 'Audio attached. Press Send or type more.',  // TODO: translate
     settings_label_tts_voice: '음성',
     settings_desc_tts_voice: '음성 합성 음성 선택',
     settings_label_tts_rate: '말 속도',
@@ -13294,6 +13334,10 @@ const LOCALES = {
     settings_desc_tts_auto_read: 'Prononcez automatiquement chaque nouvelle réponse de l\'assistant lorsqu\'elle est terminée. S\'arrête lorsque vous commencez à taper.',
     settings_label_voice_mode: 'Bouton du mode vocal mains libres',
     settings_desc_voice_mode: 'Affichez le bouton du mode vocal (forme d\'onde audio) à côté du micro de dictée. Vous permet de parler naturellement : Hermes envoie automatiquement après une pause et lit les réponses à haute voix. Nécessite un navigateur prenant en charge à la fois la reconnaissance vocale et TTS.',
+    settings_label_raw_audio: 'Envoyer l\'audio brut au lieu de transcrire',
+    settings_desc_raw_audio: 'Enregistre et envoie le fichier audio original à l\'agent au lieu de le convertir d\'abord en texte. L\'agent peut le transcrire ou traiter l\'audio brut (émotion, bruit de fond, STT personnalisé). Comme le comportement des messages vocaux de Telegram.',
+    voice_send_raw: 'Envoyer l\'audio brut',
+    voice_raw_attached: 'Audio attaché. Appuyez sur Envoyer ou ajoutez du texte.',
     settings_label_tts_voice: 'Voix',
     settings_desc_tts_voice: 'Voix préférée. Rempli à partir des voix disponibles dans votre navigateur.',
     settings_label_tts_rate: 'Taux de parole',
@@ -15085,6 +15129,10 @@ const LOCALES = {
     // Composer voice-mode pref (#1488)
     settings_label_voice_mode: 'Eller serbest ses modu düğmesi',
     settings_desc_voice_mode: 'Dikte mikrofonunun yanında ses modu düğmesini gösterir. Duraklamadan sonra Hermes otomatik gönderir ve yanıtları sesli okur. Konuşma tanıma ve TTS destekleyen tarayıcı gerektirir.',
+    settings_label_raw_audio: 'Transkripte etmek yerine ham ses gönder',
+    settings_desc_raw_audio: 'Sesi önce metne dönüştürmek yerine orijinal ses dosyasını kaydedip aracıya gönderir. Aracı, dosyayı yazıya dökebilir veya ham sesi (duygu, arka plan gürültüsü, özel STT) işleyebilir. Telegram\'ın sesli mesaj davranışı gibidir.',
+    voice_send_raw: 'Ham ses gönder',
+    voice_raw_attached: 'Ses eklendi. Gönder\'e basın veya metin ekleyin.',
     settings_label_tts_voice: 'Ses',
     settings_desc_tts_voice: 'Ses sentezi sesini seçin',
     settings_label_tts_rate: 'Konuşma hızı',
diff --git a/static/index.html b/static/index.html
index 5969bde249..35421eaedd 100644
--- a/static/index.html
+++ b/static/index.html
@@ -1062,6 +1062,13 @@ 
What can I help with?

               
               
Show the voice-mode button (audio waveform) next to the dictation mic. Lets you speak naturally — Hermes auto-sends after a pause and reads replies aloud. Requires a browser that supports both speech recognition and TTS.
+
+ +
Record and send the original audio file to the agent instead of converting it to text first. The agent can then transcribe it or process the raw audio (emotion, background noise, custom STT). Like Telegram's voice message behavior.
+