refactor(desktop): let the sidebar row read its own status
The dot resolved its state through $sessionDotStateById while the arc on the same row was decided from an isWorking prop, drilled from the sidebar through two list components and asserted in five test setups. Two paths to the same question is how the row's arc and its dot end up disagreeing, and it is why the arc has broken independently of the dot before. The row now reads the resolved state directly, and the arc rule moves next to the states it talks about as `showsRunningArc`. `hasLiveTurn` keeps the row's other treatment — brighter title, age yielding to the actions menu — on the wider meaning it always had, where a turn waiting on an answer still counts as this session's turn. The list chain drops the prop, its types and the id set built to feed it. `$workingSessionIds` stays where the sidebar genuinely needs it, for noticing that a turn settled.
This commit is contained in:
@@ -394,8 +394,6 @@ export function ChatSidebar({
|
||||
[visibleSessions]
|
||||
)
|
||||
|
||||
const workingSessionIdSet = useMemo(() => new Set(workingSessionIds), [workingSessionIds])
|
||||
|
||||
// Index sessions by every id a pin might be stored under — recents, cron,
|
||||
// AND messaging, since all three can be pinned (see session-index.ts).
|
||||
const sessionByAnyId = useMemo(
|
||||
@@ -1281,7 +1279,6 @@ export function ChatSidebar({
|
||||
rootClassName="min-h-32 flex-1 overflow-hidden p-0"
|
||||
sessions={searchResults}
|
||||
showProfileTags={showAllProfiles}
|
||||
workingSessionIdSet={workingSessionIdSet}
|
||||
/>
|
||||
)}
|
||||
|
||||
@@ -1305,7 +1302,6 @@ export function ChatSidebar({
|
||||
sessions={pinnedSessions}
|
||||
showProfileTags={showAllProfiles}
|
||||
sortable={pinnedSessions.length > 1}
|
||||
workingSessionIdSet={workingSessionIdSet}
|
||||
/>
|
||||
)}
|
||||
|
||||
@@ -1467,7 +1463,6 @@ export function ChatSidebar({
|
||||
)}
|
||||
sessions={displayAgentSessions}
|
||||
sortable={!showAllProfiles && agentSessions.length > 1}
|
||||
workingSessionIdSet={workingSessionIdSet}
|
||||
/>
|
||||
)}
|
||||
|
||||
@@ -1512,7 +1507,6 @@ export function ChatSidebar({
|
||||
pinned={false}
|
||||
rootClassName="shrink-0 p-0"
|
||||
sessions={shownSessions}
|
||||
workingSessionIdSet={workingSessionIdSet}
|
||||
/>
|
||||
)
|
||||
})}
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
import { describe, expect, it } from 'vitest'
|
||||
|
||||
import { sessionShowsRunningArc } from './session-row-state'
|
||||
|
||||
describe('session row running appearance', () => {
|
||||
it('keeps the running arc when an authoritative turn becomes quiet', () => {
|
||||
expect(sessionShowsRunningArc({ isWorking: true, needsInput: false })).toBe(true)
|
||||
})
|
||||
|
||||
it('uses the needs-input treatment instead of the running arc', () => {
|
||||
expect(sessionShowsRunningArc({ isWorking: true, needsInput: true })).toBe(false)
|
||||
})
|
||||
|
||||
it('shows no arc for a session that is not running', () => {
|
||||
expect(sessionShowsRunningArc({ isWorking: false, needsInput: false })).toBe(false)
|
||||
})
|
||||
})
|
||||
@@ -1,12 +0,0 @@
|
||||
/** A quiet turn is still authoritatively running. Keep the unmistakable row
|
||||
* arc until the gateway reports completion; only a blocking prompt suppresses
|
||||
* it in favour of the needs-input treatment. */
|
||||
export function sessionShowsRunningArc({
|
||||
isWorking,
|
||||
needsInput
|
||||
}: {
|
||||
isWorking: boolean
|
||||
needsInput: boolean
|
||||
}): boolean {
|
||||
return isWorking && !needsInput
|
||||
}
|
||||
@@ -4,8 +4,11 @@ import type * as React from 'react'
|
||||
import { afterEach, describe, expect, it, vi } from 'vitest'
|
||||
|
||||
import type { SessionInfo } from '@/hermes'
|
||||
import { createClientSessionState } from '@/lib/chat-runtime'
|
||||
import type * as ChatRuntime from '@/lib/chat-runtime'
|
||||
import type * as ComposerStatusStore from '@/store/composer-status'
|
||||
import type * as SessionStore from '@/store/session'
|
||||
import { clearAllSessionStates, publishSessionState } from '@/store/session-states'
|
||||
import type * as SessionStatesStore from '@/store/session-states'
|
||||
import type * as WindowsStore from '@/store/windows'
|
||||
|
||||
@@ -41,7 +44,14 @@ vi.mock('@/app/chat/session-drag', () => ({ startSessionDrag: vi.fn() }))
|
||||
// props itself only proves the MOCK forwards them, not that the real
|
||||
// component does. This file exercises the actual production component so a
|
||||
// regression in its ref/prop forwarding fails here again.
|
||||
vi.mock('@/lib/chat-runtime', () => ({ sessionTitle: (s: SessionInfo) => (s as unknown as { title: string }).title }))
|
||||
// Only `sessionTitle` is overridden (makeSession fakes a bare `title` the real
|
||||
// one wouldn't read); the rest of the module is genuine so the arc test can
|
||||
// build session state with the same factory the app uses.
|
||||
vi.mock('@/lib/chat-runtime', async importOriginal => {
|
||||
const actual = await importOriginal<typeof ChatRuntime>()
|
||||
|
||||
return { ...actual, sessionTitle: (s: SessionInfo) => (s as unknown as { title: string }).title }
|
||||
})
|
||||
vi.mock('@/lib/haptics', () => ({ triggerHaptic: vi.fn() }))
|
||||
vi.mock('@/lib/session-source', () => ({
|
||||
handoffOriginSource: (state?: string, platform?: string) => (state && platform ? platform : null),
|
||||
@@ -124,13 +134,51 @@ const handoffAvatar = (container: HTMLElement) =>
|
||||
|
||||
const noop = vi.fn()
|
||||
|
||||
const renderRow = (session: SessionInfo) =>
|
||||
render(
|
||||
<SidebarSessionRow
|
||||
isPinned={false}
|
||||
isSelected={false}
|
||||
onArchive={noop}
|
||||
onDelete={noop}
|
||||
onPin={noop}
|
||||
onResume={noop}
|
||||
session={session}
|
||||
/>
|
||||
)
|
||||
|
||||
// The row no longer takes its running state as a prop, so this drives the real
|
||||
// store the way the app does. $workingSessionIds is the actual computed here
|
||||
// (the mock above only overrides its siblings), which is what makes this cover
|
||||
// the wiring rather than the predicate — the arc has gone missing before.
|
||||
describe('SidebarSessionRow running arc', () => {
|
||||
afterEach(() => {
|
||||
clearAllSessionStates()
|
||||
})
|
||||
|
||||
const arc = (container: HTMLElement) => container.querySelector('.arc-row')
|
||||
|
||||
it('paints no arc for a settled session', () => {
|
||||
const { container } = renderRow(makeSession({ title: 'Settled' }))
|
||||
|
||||
expect(arc(container)).toBeNull()
|
||||
})
|
||||
|
||||
it('paints the arc while the session is running', () => {
|
||||
publishSessionState('rt1', { ...createClientSessionState('s1'), busy: true })
|
||||
|
||||
const { container } = renderRow(makeSession({ title: 'Running' }))
|
||||
|
||||
expect(arc(container)).toBeTruthy()
|
||||
})
|
||||
})
|
||||
|
||||
describe('SidebarSessionRow', () => {
|
||||
it('keeps an aria-label on the kebab without wrapping it in a Tip', () => {
|
||||
render(
|
||||
<SidebarSessionRow
|
||||
isPinned={false}
|
||||
isSelected={false}
|
||||
isWorking={false}
|
||||
onArchive={noop}
|
||||
onDelete={noop}
|
||||
onPin={noop}
|
||||
@@ -148,7 +196,6 @@ describe('SidebarSessionRow', () => {
|
||||
<SidebarSessionRow
|
||||
isPinned={false}
|
||||
isSelected={false}
|
||||
isWorking={false}
|
||||
onArchive={noop}
|
||||
onDelete={noop}
|
||||
onPin={noop}
|
||||
@@ -165,7 +212,6 @@ describe('SidebarSessionRow', () => {
|
||||
<SidebarSessionRow
|
||||
isPinned={false}
|
||||
isSelected={false}
|
||||
isWorking={false}
|
||||
onArchive={noop}
|
||||
onDelete={noop}
|
||||
onPin={noop}
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { useStore } from '@nanostores/react'
|
||||
import { memo } from 'react'
|
||||
import type * as React from 'react'
|
||||
|
||||
@@ -16,14 +15,14 @@ import { triggerHaptic } from '@/lib/haptics'
|
||||
import { middleClickHandlers } from '@/lib/middle-click'
|
||||
import { handoffOriginSource, sessionSourceLabel } from '@/lib/session-source'
|
||||
import { coarseElapsed } from '@/lib/time'
|
||||
import { useStoreSelector } from '@/lib/use-session-slice'
|
||||
import { cn } from '@/lib/utils'
|
||||
import { $attentionSessionIds } from '@/store/session-states'
|
||||
import { $sessionDotStateById, hasLiveTurn, showsRunningArc } from '@/store/session-dot-state'
|
||||
|
||||
import { SessionStatusDot } from '../session-status-dot'
|
||||
|
||||
import { SidebarRowBody, SidebarRowGrab, SidebarRowLabel, SidebarRowLead, SidebarRowShell } from './chrome'
|
||||
import { SessionActionsMenu, SessionContextMenu } from './session-actions-menu'
|
||||
import { sessionShowsRunningArc } from './session-row-state'
|
||||
import { useProfilePrewarm } from './use-profile-prewarm'
|
||||
|
||||
interface SidebarSessionRowProps extends React.ComponentProps<'div'> {
|
||||
@@ -32,7 +31,6 @@ interface SidebarSessionRowProps extends React.ComponentProps<'div'> {
|
||||
branchStem?: string
|
||||
isPinned: boolean
|
||||
isSelected: boolean
|
||||
isWorking: boolean
|
||||
onArchive: () => void
|
||||
onBranch?: () => void
|
||||
onDelete: () => void
|
||||
@@ -61,7 +59,6 @@ function SidebarSessionRowImpl({
|
||||
branchStem,
|
||||
isPinned,
|
||||
isSelected,
|
||||
isWorking,
|
||||
onArchive,
|
||||
onBranch,
|
||||
onDelete,
|
||||
@@ -87,8 +84,11 @@ function SidebarSessionRowImpl({
|
||||
// Telegram thread continued here still reads as Telegram.
|
||||
const handoffSource = handoffOriginSource(session.handoff_state, session.handoff_platform)
|
||||
const handoffLabel = handoffSource ? (sessionSourceLabel(handoffSource) ?? handoffSource) : null
|
||||
// True when a clarify prompt in this session is waiting on the user.
|
||||
const needsInput = useStore($attentionSessionIds).includes(session.id)
|
||||
// The same resolved state the row's dot paints, so the arc and the dot cannot
|
||||
// contradict each other. A selector, not a plain useStore: the map is rebuilt
|
||||
// whenever any session's status changes, but a row only repaints on its own.
|
||||
const dotState = useStoreSelector($sessionDotStateById, states => states[session.id] ?? 'idle')
|
||||
const liveTurn = hasLiveTurn(dotState)
|
||||
|
||||
return (
|
||||
<SessionContextMenu
|
||||
@@ -104,7 +104,7 @@ function SidebarSessionRowImpl({
|
||||
<SidebarRowShell
|
||||
actions={
|
||||
<div className="relative z-2 grid w-[1.375rem] place-items-center" data-row-actions>
|
||||
{!isWorking && (
|
||||
{!liveTurn && (
|
||||
<span className="pointer-events-none absolute right-6 top-1/2 min-w-6 -translate-y-1/2 text-right text-[0.625rem] leading-none text-(--ui-text-tertiary) opacity-0 transition-opacity group-hover:opacity-100">
|
||||
{age}
|
||||
</span>
|
||||
@@ -133,13 +133,13 @@ function SidebarSessionRowImpl({
|
||||
className={cn(
|
||||
'group row-hover relative',
|
||||
isSelected && 'bg-(--ui-row-active-background)',
|
||||
isWorking && 'text-foreground',
|
||||
liveTurn && 'text-foreground',
|
||||
// Opaque surface while lifted so the dragged row erases what's under
|
||||
// it (translucency let the rows below bleed through).
|
||||
dragging && 'z-10 cursor-grabbing bg-(--ui-sidebar-surface-background)',
|
||||
className
|
||||
)}
|
||||
data-working={isWorking ? 'true' : undefined}
|
||||
data-working={liveTurn ? 'true' : undefined}
|
||||
onPointerDown={event => {
|
||||
// Reorder drags belong to dnd-kit (the grab handle); the ⋯ actions
|
||||
// cluster keeps its own gestures. Everything else on the row —
|
||||
@@ -164,9 +164,7 @@ function SidebarSessionRowImpl({
|
||||
style={style}
|
||||
{...rest}
|
||||
>
|
||||
{sessionShowsRunningArc({ isWorking, needsInput }) && (
|
||||
<span aria-hidden="true" className="arc-border arc-row" />
|
||||
)}
|
||||
{showsRunningArc(dotState) && <span aria-hidden="true" className="arc-border arc-row" />}
|
||||
<SidebarRowBody
|
||||
className={cn('z-0 group-hover:pr-12', branchStem && 'pl-3.5')}
|
||||
// Middle-click = open in a new tab (browser muscle memory).
|
||||
@@ -252,14 +250,14 @@ function SidebarSessionRowImpl({
|
||||
// design (they close over the row's session id), so a default memo never bails.
|
||||
// They're pure id-forwarders, though — identical behavior for a given row — so
|
||||
// the comparator deliberately ignores them and compares only the DATA that
|
||||
// changes what the row paints. A row whose session/selection/working/pin state
|
||||
// is unchanged now bails out, even while a sibling session streams.
|
||||
// changes what the row paints. A row whose session/selection/pin state is
|
||||
// unchanged now bails out, even while a sibling session streams; its own status
|
||||
// arrives through a store subscription, which re-renders it past this bail.
|
||||
function rowPropsEqual(a: SidebarSessionRowProps, b: SidebarSessionRowProps): boolean {
|
||||
return (
|
||||
a.session === b.session &&
|
||||
a.isPinned === b.isPinned &&
|
||||
a.isSelected === b.isSelected &&
|
||||
a.isWorking === b.isWorking &&
|
||||
a.branchStem === b.branchStem &&
|
||||
a.reorderable === b.reorderable &&
|
||||
a.dragging === b.dragging &&
|
||||
|
||||
@@ -78,7 +78,6 @@ describe('SidebarSessionsSection memoization & virtualizer stability', () => {
|
||||
open={true}
|
||||
pinned={false}
|
||||
sessions={sessions}
|
||||
workingSessionIdSet={new Set()}
|
||||
/>
|
||||
)
|
||||
|
||||
@@ -100,7 +99,6 @@ describe('SidebarSessionsSection memoization & virtualizer stability', () => {
|
||||
open={true}
|
||||
pinned={false}
|
||||
sessions={sessions}
|
||||
workingSessionIdSet={new Set()}
|
||||
/>
|
||||
)
|
||||
|
||||
@@ -130,7 +128,6 @@ describe('SidebarSessionsSection memoization & virtualizer stability', () => {
|
||||
open={true}
|
||||
pinned={false}
|
||||
sessions={initialSessions}
|
||||
workingSessionIdSet={new Set()}
|
||||
/>
|
||||
)
|
||||
|
||||
@@ -151,7 +148,6 @@ describe('SidebarSessionsSection memoization & virtualizer stability', () => {
|
||||
open={true}
|
||||
pinned={false}
|
||||
sessions={initialSessions}
|
||||
workingSessionIdSet={new Set()}
|
||||
/>
|
||||
)
|
||||
|
||||
@@ -174,7 +170,6 @@ describe('SidebarSessionsSection memoization & virtualizer stability', () => {
|
||||
open={true}
|
||||
pinned={false}
|
||||
sessions={updatedSessions}
|
||||
workingSessionIdSet={new Set()}
|
||||
/>
|
||||
)
|
||||
|
||||
|
||||
@@ -91,7 +91,6 @@ interface SidebarSessionsSectionProps {
|
||||
onToggle: () => void
|
||||
sessions: SessionInfo[]
|
||||
activeSessionId: null | string
|
||||
workingSessionIdSet: Set<string>
|
||||
onResumeSession: (sessionId: string) => void
|
||||
onDeleteSession: (sessionId: string) => void
|
||||
onArchiveSession: (sessionId: string) => void
|
||||
@@ -163,7 +162,6 @@ export function SidebarSessionsSection({
|
||||
onToggle,
|
||||
sessions,
|
||||
activeSessionId,
|
||||
workingSessionIdSet,
|
||||
onResumeSession,
|
||||
onDeleteSession,
|
||||
onArchiveSession,
|
||||
@@ -236,7 +234,6 @@ export function SidebarSessionsSection({
|
||||
branchStem,
|
||||
isPinned: pinned,
|
||||
isSelected: session.id === activeSessionId,
|
||||
isWorking: workingSessionIdSet.has(session.id),
|
||||
onArchive: () => onArchiveSession(session.id),
|
||||
onBranch: onBranchSession ? () => onBranchSession(session.id, session.profile) : undefined,
|
||||
onDelete: () => onDeleteSession(session.id),
|
||||
@@ -261,8 +258,7 @@ export function SidebarSessionsSection({
|
||||
onResumeSession,
|
||||
onTogglePin,
|
||||
pinned,
|
||||
showProfileTags,
|
||||
workingSessionIdSet
|
||||
showProfileTags
|
||||
]
|
||||
)
|
||||
|
||||
@@ -423,7 +419,6 @@ export function SidebarSessionsSection({
|
||||
rows={flatRows}
|
||||
showProfileTags={showProfileTags}
|
||||
sortable={sessionsDraggable}
|
||||
workingSessionIdSet={workingSessionIdSet}
|
||||
/>
|
||||
)
|
||||
|
||||
@@ -474,7 +469,6 @@ interface SortableSessionRowProps {
|
||||
session: SessionInfo
|
||||
isPinned: boolean
|
||||
isSelected: boolean
|
||||
isWorking: boolean
|
||||
onArchive: () => void
|
||||
onDelete: () => void
|
||||
onPin: () => void
|
||||
|
||||
@@ -17,7 +17,6 @@ interface SessionRowCommonProps {
|
||||
branchStem?: string
|
||||
isPinned: boolean
|
||||
isSelected: boolean
|
||||
isWorking: boolean
|
||||
onArchive: () => void
|
||||
onBranch?: () => void
|
||||
onDelete: () => void
|
||||
@@ -39,7 +38,6 @@ export interface VirtualSessionListProps {
|
||||
pinned: boolean
|
||||
showProfileTags?: boolean
|
||||
sortable: boolean
|
||||
workingSessionIdSet: Set<string>
|
||||
}
|
||||
|
||||
const ROW_ESTIMATE_PX = 28
|
||||
@@ -56,8 +54,7 @@ export const VirtualSessionList: FC<VirtualSessionListProps> = ({
|
||||
onTogglePin,
|
||||
pinned,
|
||||
showProfileTags = false,
|
||||
sortable,
|
||||
workingSessionIdSet
|
||||
sortable
|
||||
}) => {
|
||||
const { t } = useI18n()
|
||||
const dividerLabels = t.sidebar.dateDivider
|
||||
@@ -108,7 +105,6 @@ export const VirtualSessionList: FC<VirtualSessionListProps> = ({
|
||||
branchStem,
|
||||
isPinned: pinned,
|
||||
isSelected: session.id === activeSessionId,
|
||||
isWorking: workingSessionIdSet.has(session.id),
|
||||
onArchive: () => onArchiveSession(session.id),
|
||||
onBranch: onBranchSession ? () => onBranchSession(session.id, session.profile) : undefined,
|
||||
onDelete: () => onDeleteSession(session.id),
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
import { describe, expect, it } from 'vitest'
|
||||
|
||||
import { hasLiveTurn, showsRunningArc } from './session-dot-state'
|
||||
|
||||
describe('showsRunningArc', () => {
|
||||
it('keeps the arc when an authoritative turn goes quiet', () => {
|
||||
expect(showsRunningArc('working')).toBe(true)
|
||||
expect(showsRunningArc('stalled')).toBe(true)
|
||||
})
|
||||
|
||||
it('yields to the needs-input treatment rather than running both', () => {
|
||||
expect(showsRunningArc('needs-input')).toBe(false)
|
||||
})
|
||||
|
||||
it('leaves a session that is not running unmarked', () => {
|
||||
expect(showsRunningArc('background')).toBe(false)
|
||||
expect(showsRunningArc('idle')).toBe(false)
|
||||
expect(showsRunningArc('unread')).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('hasLiveTurn', () => {
|
||||
it('counts a turn waiting on an answer as still live', () => {
|
||||
expect(hasLiveTurn('needs-input')).toBe(true)
|
||||
})
|
||||
|
||||
it('covers everything the arc covers', () => {
|
||||
for (const state of ['background', 'idle', 'needs-input', 'stalled', 'unread', 'working'] as const) {
|
||||
expect(hasLiveTurn(state) || !showsRunningArc(state)).toBe(true)
|
||||
}
|
||||
})
|
||||
|
||||
it('excludes work that outlived the turn', () => {
|
||||
expect(hasLiveTurn('background')).toBe(false)
|
||||
expect(hasLiveTurn('unread')).toBe(false)
|
||||
})
|
||||
})
|
||||
@@ -27,6 +27,16 @@ import { $attentionSessionIds, $stalledSessionIds, $workingSessionIds } from './
|
||||
|
||||
export type SessionDotState = 'background' | 'idle' | 'needs-input' | 'stalled' | 'unread' | 'working'
|
||||
|
||||
/** The sidebar row's arc. A quiet turn is still authoritatively running, so
|
||||
* `stalled` keeps it; a blocking prompt drops it, because the amber dot is the
|
||||
* louder cue and two treatments at once fight each other. */
|
||||
export const showsRunningArc = (state: SessionDotState): boolean => state === 'stalled' || state === 'working'
|
||||
|
||||
/** Whether this turn is the session's own, live: brighter title, and the row's
|
||||
* age yields to the actions menu. Wider than the arc — a turn waiting on an
|
||||
* answer has not ended. */
|
||||
export const hasLiveTurn = (state: SessionDotState): boolean => showsRunningArc(state) || state === 'needs-input'
|
||||
|
||||
let dotStates: Readonly<Record<string, SessionDotState>> = {}
|
||||
|
||||
export const $sessionDotStateById = computed(
|
||||
|
||||
Reference in New Issue
Block a user