fix(desktop): restore pinned sessions after restart - #39360
fix(desktop): restore pinned sessions after restart#39360Tamaz-sujashvili wants to merge 1 commit into
Conversation
Cold boot merges an empty previous page, so pin ids dropped out of the sidebar. Fetch missing pin rows via session search and merge them in. Fixes NousResearch#38858 Co-authored-by: Cursor <cursoragent@cursor.com>
alt-glitch
added
type/bug
teknium1
left a comment
teknium1
left a comment
There was a problem hiding this comment.
Thanks for tracing the cold-boot gap. The premise remains valid on current main: useSessionListActions.ts:176-182 loads only the bounded recent page, while sidebar/index.tsx:344-377 can render pins only from loaded rows.
Problems
apps/desktop/src/store/session.ts:112falls back tores.results[0]when no returned result matches the pin. The search endpoint combines ID and FTS matches (hermes_cli/web_server.py:4193-4347), so a stale pin can add an unrelated session.apps/desktop/src/app/desktop-controller.tsx:250-251awaits hydration after the request-id check, then writes without rechecking it; a newer refresh can be overwritten by this stale response.- The diff adds no regression test for a cold-start, off-page pin.
Suggested changes
- Port the behavior to current main's
apps/desktop/src/app/session/hooks/use-session-list-actions.ts:155-194, preserving request-generation safety after awaits. - Hydrate exact ID/lineage matches only, and cover cold boot, failed lookup, compression lineage, and overlapping refreshes.
- Use a profile-aware hydration path for the current unified profile list; related open PR #60019 already documents that design direction.
Automated hermes-sweeper review.
| try { | ||
| const res = await searchSessions(pinId) | ||
| const hit = | ||
| res.results.find(r => r.session_id === pinId || r.lineage_root === pinId) ?? res.results[0] |
There was a problem hiding this comment.
searchSessions() also returns FTS content matches. If this stale pin has no exact session_id/lineage_root match, falling back to results[0] can inject an unrelated session into the sidebar. Hydrate only the exact match and leave a missing pin unresolved.
| setSessions(prev => mergeSessionPage(prev, result.sessions, keepIds)) | ||
| const merged = mergeSessionPage($sessions.get(), result.sessions, keepIds) | ||
| const withPins = await hydratePinnedSessions(merged, $pinnedSessionIds.get()) | ||
| setSessions(withPins) |
There was a problem hiding this comment.
This write occurs after an await, but the request-id guard was checked before hydration. A newer refresh can complete during that await and then be overwritten by this older snapshot. Recheck refreshSessionsRequestRef.current === requestId immediately before publishing.
teknium1
added
sweeper:risk-session-state
|
Superseded by #74234, which makes pins server-owned so they survive paging and sync between apps. Your work is carried in it and you're credited as a co-author — thank you. |
4 participants
Summary
mergeSessionPagedrops pin ids not in the first page; fetch missing pins viasearchSessionsand merge.searchResultToSessionhelper for FTS hits.Test plan
Fixes #38858
Made with Cursor