fix(desktop): session rows are identified by (profile, id) — twins in two profiles stop collapsing and mis-routing (#92454)
Two profiles can hold sessions with the SAME stored id (restored backups, copied state.dbs, cross-profile imports). mergeSessionPage keyed rows by bare id, so the twins collapsed into one sidebar row whose title/activity carry stitched one profile's content onto the other's route — clicking a row previewing profile A resumed profile B and wedged on an eternal 'Waking up…' when the mismatched resume never completed (live-reproduced on main). - mergeSessionPage: identity + lineage + dedupe keys are now (profile, id); a kept twin in another profile survives the incoming page dedupe. Local profile normalize (importing @/store/profile would be circular). - Sidebar clicks carry the ROW as the identity: onResumeSession passes the clicked SessionInfo, and wiring pins the row's own (connection, profile) as the resume owner via requestSessionResume before navigating. Untagged rows keep the id-only path.
This commit is contained in:
@@ -296,7 +296,7 @@ interface ChatSidebarProps extends React.ComponentProps<typeof Sidebar> {
|
||||
onNavigate: (item: SidebarNavItem) => void
|
||||
onLoadMoreSessions: () => Promise<void> | void
|
||||
onLoadMoreMessaging?: (platform: string) => Promise<void> | void
|
||||
onResumeSession: (sessionId: string) => void
|
||||
onResumeSession: (sessionId: string, session?: SessionInfo) => void
|
||||
onDeleteSession: (sessionId: string) => void
|
||||
onArchiveSession: (sessionId: string) => void
|
||||
onBranchSession: (sessionId: string) => void
|
||||
|
||||
@@ -99,7 +99,7 @@ interface SidebarSessionsSectionProps {
|
||||
onToggle: () => void
|
||||
sessions: SessionInfo[]
|
||||
activeSessionId: null | string
|
||||
onResumeSession: (sessionId: string) => void
|
||||
onResumeSession: (sessionId: string, session?: SessionInfo) => void
|
||||
onDeleteSession: (sessionId: string) => void
|
||||
onArchiveSession: (sessionId: string) => void
|
||||
onBranchSession?: (sessionId: string, profile?: string) => void
|
||||
@@ -259,17 +259,20 @@ export function SidebarSessionsSection({
|
||||
onDelete: () => onDeleteSession(session.id),
|
||||
onPin: () => onTogglePin(sessionPinId(session)),
|
||||
onToggleUnread: () => onToggleUnread(session.id),
|
||||
onResume: () => onResumeSession(session.id),
|
||||
onResume: () => onResumeSession(session.id, session),
|
||||
reorderable: draggable && !branchStem,
|
||||
session,
|
||||
showProfile: showProfileTags,
|
||||
unread: session.unread === true
|
||||
}
|
||||
|
||||
// Key by (profile, id): twins with the same stored id in two profiles
|
||||
// are distinct rows (#92454) — a bare-id key makes React misattribute
|
||||
// one twin's rendered state to the other.
|
||||
return draggable && !branchStem ? (
|
||||
<SortableSidebarSessionRow key={session.id} {...rowProps} />
|
||||
<SortableSidebarSessionRow key={`${session.profile ?? ''}::${session.id}`} {...rowProps} />
|
||||
) : (
|
||||
<SidebarSessionRow key={session.id} {...rowProps} />
|
||||
<SidebarSessionRow key={`${session.profile ?? ''}::${session.id}`} {...rowProps} />
|
||||
)
|
||||
},
|
||||
[
|
||||
|
||||
@@ -44,7 +44,7 @@ export interface VirtualSessionListProps {
|
||||
onArchiveSession: (sessionId: string) => void
|
||||
onBranchSession?: (sessionId: string, profile?: string) => void
|
||||
onDeleteSession: (sessionId: string) => void
|
||||
onResumeSession: (sessionId: string) => void
|
||||
onResumeSession: (sessionId: string, session?: SessionInfo) => void
|
||||
onTogglePin: (sessionId: string) => void
|
||||
onToggleUnread: (sessionId: string) => void
|
||||
pinned: boolean
|
||||
@@ -149,18 +149,22 @@ export const VirtualSessionList: FC<VirtualSessionListProps> = ({
|
||||
onDelete: () => onDeleteSession(session.id),
|
||||
onPin: () => onTogglePin(sessionPinId(session)),
|
||||
onToggleUnread: () => onToggleUnread(session.id),
|
||||
onResume: () => onResumeSession(session.id),
|
||||
onResume: () => onResumeSession(session.id, session),
|
||||
reorderable,
|
||||
showProfile: showProfileTags,
|
||||
unread: session.unread === true
|
||||
}
|
||||
|
||||
// Key by (profile, id): twins with the same stored id in two profiles are
|
||||
// distinct rows (#92454) — a bare-id key misattributes rendered state.
|
||||
const rowKey = `${session.profile ?? ''}::${session.id}`
|
||||
|
||||
return reorderable ? (
|
||||
<div data-index={virtualItem.index} key={session.id} ref={virtualizer.measureElement} style={itemStyle}>
|
||||
<div data-index={virtualItem.index} key={rowKey} ref={virtualizer.measureElement} style={itemStyle}>
|
||||
<VirtualSortableRow rowProps={commonProps} session={session} />
|
||||
</div>
|
||||
) : (
|
||||
<div data-index={virtualItem.index} key={session.id} ref={virtualizer.measureElement} style={itemStyle}>
|
||||
<div data-index={virtualItem.index} key={rowKey} ref={virtualizer.measureElement} style={itemStyle}>
|
||||
<SidebarSessionRow {...commonProps} session={session} />
|
||||
</div>
|
||||
)
|
||||
|
||||
@@ -71,6 +71,7 @@ import {
|
||||
$selectedStoredSessionId,
|
||||
$sessionResumeRequest,
|
||||
$sessions,
|
||||
requestSessionResume,
|
||||
sessionMatchesStoredId,
|
||||
sessionPinId,
|
||||
setAwaitingResponse,
|
||||
@@ -990,7 +991,26 @@ export function ContribWiring({ children }: { children: ReactNode }) {
|
||||
onRestoreToMessage: restoreToMessage,
|
||||
// Already on screen (open tile, or the main session)? Jump to its tab;
|
||||
// otherwise load it into main. Same door every other session link uses.
|
||||
onResumeSession: sessionId => openSession(sessionId, navigate),
|
||||
// The clicked ROW is the identity, not its bare id: two profiles can hold
|
||||
// twins with the same stored id (#92454), and an id-only resume resolves
|
||||
// against whichever cached row is found first — the user clicks a row
|
||||
// previewing profile A and the resume dials profile B. Pin the row's own
|
||||
// (connection, profile) as the resume owner before navigating; untagged
|
||||
// rows (single-profile installs, legacy pages) keep the id-only path.
|
||||
onResumeSession: (sessionId, session) => {
|
||||
const rowProfile = session?.profile?.trim()
|
||||
|
||||
if (rowProfile) {
|
||||
requestSessionResume(sessionId, {
|
||||
connectionId: session?.connection_id?.trim() || 'local',
|
||||
...(session?.connection_id?.trim() ? {} : { mode: 'local' as const }),
|
||||
profile: rowProfile,
|
||||
targetProfile: rowProfile
|
||||
})
|
||||
}
|
||||
|
||||
openSession(sessionId, navigate)
|
||||
},
|
||||
onRetryResume: sessionId => void resumeSession(sessionId, true),
|
||||
onSteer: steerPrompt,
|
||||
onSubmit: submitText,
|
||||
|
||||
@@ -328,6 +328,40 @@ describe('mergeSessionPage', () => {
|
||||
expect(mergeSessionPage(previous, incoming, [])[0]).toBe(incoming[0])
|
||||
})
|
||||
|
||||
it('never stitches one profile twin onto another: same id in two profiles stays two sessions (#92454)', () => {
|
||||
// Two profiles can hold sessions with the SAME stored id (restored
|
||||
// backups, copied state.dbs). Keyed by bare id these collapsed into one
|
||||
// row whose title/activity carry crossed profiles — the visible seed of
|
||||
// the cross-profile transcript/route mixups.
|
||||
const previous = [session({ id: 'twin', last_active: 50, profile: 'testbot', title: 'Testbot work' })]
|
||||
|
||||
const incoming = [
|
||||
session({ id: 'twin', last_active: 10, profile: 'quietbot' }),
|
||||
session({ id: 'twin', last_active: 50, profile: 'testbot', title: 'Testbot work' })
|
||||
]
|
||||
|
||||
const merged = mergeSessionPage(previous, incoming, [])
|
||||
|
||||
// Both twins survive as distinct rows…
|
||||
expect(merged.map(s => `${s.profile}:${s.id}`).sort()).toEqual(['quietbot:twin', 'testbot:twin'])
|
||||
// …and testbot's title/activity is NOT stitched onto quietbot's row.
|
||||
const quiet = merged.find(s => s.profile === 'quietbot')
|
||||
expect(quiet?.title ?? null).toBeNull()
|
||||
expect(quiet?.last_active).toBe(10)
|
||||
})
|
||||
|
||||
it('a kept twin in another profile survives the incoming page dedupe (#92454)', () => {
|
||||
// The incoming page carries only ONE profile's copy; the other profile's
|
||||
// twin was in the previous list and pinned via keep. Bare-id dedupe
|
||||
// treated the ids as equal and dropped the kept twin.
|
||||
const previous = [session({ id: 'twin', profile: 'quietbot' })]
|
||||
const incoming = [session({ id: 'twin', message_count: 2, profile: 'testbot' })]
|
||||
|
||||
const merged = mergeSessionPage(previous, incoming, ['twin'])
|
||||
|
||||
expect(merged.map(s => `${s.profile}:${s.id}`).sort()).toEqual(['quietbot:twin', 'testbot:twin'])
|
||||
})
|
||||
|
||||
it('returns the server page untouched when there is nothing to keep', () => {
|
||||
const previous = [session({ id: 'a' }), session({ id: 'b' })]
|
||||
const incoming = [session({ id: 'a' })]
|
||||
|
||||
@@ -484,18 +484,34 @@ export function mergeSessionPage(
|
||||
): SessionInfo[] {
|
||||
const keep = keepIds instanceof Set ? keepIds : new Set(keepIds)
|
||||
|
||||
// Rows are identified by (profile, id), never bare id: two profiles can
|
||||
// hold sessions with the SAME stored id (restored backups, copied
|
||||
// state.dbs, cross-profile imports — #92454). Keyed by bare id, the twins
|
||||
// collapse into one sidebar row whose title/preview carry can stitch one
|
||||
// profile's content onto the other profile's route — the user clicks a row
|
||||
// previewing profile A and the resume dials profile B. Same-profile rows
|
||||
// (including untagged ones, which normalize together) keep the exact
|
||||
// carry behavior below.
|
||||
// (Local normalize: importing @/store/profile here would be circular —
|
||||
// same '' → 'default' rule as normalizeProfileKey.)
|
||||
const profileKeyOf = (session: SessionInfo) => (session.profile ?? '').trim() || 'default'
|
||||
const identity = (session: SessionInfo) => `${profileKeyOf(session)}::${session.id}`
|
||||
|
||||
const lineageIdentity = (session: SessionInfo) =>
|
||||
`${profileKeyOf(session)}::${session._lineage_root_id ?? session.id}`
|
||||
|
||||
// Carry a known title onto a row that arrives title-less, so a freshly
|
||||
// submitted session (e.g. a branch draft) holds its placeholder instead of
|
||||
// flashing its raw message preview in the gap between persist and the async
|
||||
// auto-titler. A real clear sets the local title null first, so this never
|
||||
// masks one.
|
||||
const prevById = new Map(previous.map(session => [session.id, session]))
|
||||
const prevById = new Map(previous.map(session => [identity(session), session]))
|
||||
// Tip rotation changes the live id — carry activity/title across the lineage
|
||||
// root so a mid-turn refresh can't drop a touchSessionActivity bump.
|
||||
const prevByLineage = new Map(previous.map(session => [session._lineage_root_id ?? session.id, session]))
|
||||
const prevByLineage = new Map(previous.map(session => [lineageIdentity(session), session]))
|
||||
|
||||
const merged = incoming.map(session => {
|
||||
const prev = prevById.get(session.id) ?? prevByLineage.get(session._lineage_root_id ?? session.id)
|
||||
const prev = prevById.get(identity(session)) ?? prevByLineage.get(lineageIdentity(session))
|
||||
// User-send stamps last_active before the DB flushes the user row
|
||||
// (last_active = MAX(messages.timestamp)). Keep the fresher of the two.
|
||||
const last_active = Math.max(prev?.last_active ?? 0, session.last_active ?? 0)
|
||||
@@ -519,18 +535,20 @@ export function mergeSessionPage(
|
||||
return merged
|
||||
}
|
||||
|
||||
const incomingIds = new Set(merged.map(session => session.id))
|
||||
const incomingIds = new Set(merged.map(identity))
|
||||
|
||||
// Deduplicate by compression lineage: when auto-compression rotates the tip
|
||||
// id (old #4 → new #5), the incoming page carries the new tip but the
|
||||
// previous list still holds the old one. Without lineage-level dedup both
|
||||
// rows survive as separate sidebar entries (fixes #43483).
|
||||
const incomingLineageKeys = new Set(merged.map(session => session._lineage_root_id ?? session.id))
|
||||
// rows survive as separate sidebar entries (fixes #43483). Lineage keys are
|
||||
// profile-qualified for the same reason as identity above — a twin id in
|
||||
// another profile is a DIFFERENT session and must survive the dedupe.
|
||||
const incomingLineageKeys = new Set(merged.map(lineageIdentity))
|
||||
|
||||
const survivors = previous.filter(
|
||||
session =>
|
||||
!incomingIds.has(session.id) &&
|
||||
!incomingLineageKeys.has(session._lineage_root_id ?? session.id) &&
|
||||
!incomingIds.has(identity(session)) &&
|
||||
!incomingLineageKeys.has(lineageIdentity(session)) &&
|
||||
(keep.has(session.id) || (session._lineage_root_id != null && keep.has(session._lineage_root_id)))
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user