Skip to content

feat(web): group sessions by machine and improve group headers #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiann merged 3 commits into from
Apr 1, 2026
+134 −43
Merged

feat(web): group sessions by machine and improve group headers #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
087b9cf
feat(web): group sessions by machine and improve group headers
gaius-codius Apr 1, 2026
2ed8460
fix: keep sidebar group expanded when it contains the selected session
gaius-codius Apr 1, 2026
02302d6
fix: address review feedback on session machine grouping
gaius-codius Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
155 changes: 114 additions & 41 deletions web/src/components/SessionList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ import { getSessionModelLabel } from '@/lib/sessionModelLabel'
import { useTranslation } from '@/lib/use-translation'

type SessionGroup = {
key: string
directory: string
displayName: string
machineId: string | null
sessions: SessionSummary[]
latestUpdatedAt: number
hasActiveSession: boolean
Expand All @@ -26,33 +28,49 @@ function getGroupDisplayName(directory: string): string {
return `${parts[parts.length - 2]}/${parts[parts.length - 1]}`
}

export const UNKNOWN_MACHINE_ID = '__unknown__'

function groupSessionsByDirectory(sessions: SessionSummary[]): SessionGroup[] {
const groups = new Map<string, SessionSummary[]>()
const groups = new Map<string, { directory: string; machineId: string | null; sessions: SessionSummary[] }>()

sessions.forEach(session => {
const path = session.metadata?.worktree?.basePath ?? session.metadata?.path ?? 'Other'
if (!groups.has(path)) {
groups.set(path, [])
const machineId = session.metadata?.machineId ?? null
const key = `${machineId ?? UNKNOWN_MACHINE_ID}::${path}`
if (!groups.has(key)) {
groups.set(key, {
directory: path,
machineId,
sessions: []
})
}
groups.get(path)!.push(session)
groups.get(key)!.sessions.push(session)
})

return Array.from(groups.entries())
.map(([directory, groupSessions]) => {
const sortedSessions = [...groupSessions].sort((a, b) => {
.map(([key, group]) => {
const sortedSessions = [...group.sessions].sort((a, b) => {
const rankA = a.active ? (a.pendingRequestsCount > 0 ? 0 : 1) : 2
const rankB = b.active ? (b.pendingRequestsCount > 0 ? 0 : 1) : 2
if (rankA !== rankB) return rankA - rankB
return b.updatedAt - a.updatedAt
})
const latestUpdatedAt = groupSessions.reduce(
const latestUpdatedAt = group.sessions.reduce(
(max, s) => (s.updatedAt > max ? s.updatedAt : max),
-Infinity
)
const hasActiveSession = groupSessions.some(s => s.active)
const displayName = getGroupDisplayName(directory)
const hasActiveSession = group.sessions.some(s => s.active)
const displayName = getGroupDisplayName(group.directory)

return { directory, displayName, sessions: sortedSessions, latestUpdatedAt, hasActiveSession }
return {
key,
directory: group.directory,
displayName,
machineId: group.machineId,
sessions: sortedSessions,
latestUpdatedAt,
hasActiveSession
}
})
.sort((a, b) => {
if (a.hasActiveSession !== b.hasActiveSession) {
Expand Down Expand Up @@ -148,6 +166,27 @@ function getAgentLabel(session: SessionSummary): string {
return 'unknown'
}

function MachineIcon(props: { className?: string }) {
return (
<svg
xmlns="http://www.w3.org/2000/svg"
width="14"
height="14"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
className={props.className}
>
<rect x="2" y="3" width="20" height="14" rx="2" />
<line x1="8" y1="21" x2="16" y2="21" />
<line x1="12" y1="17" x2="12" y2="21" />
</svg>
)
}

function formatRelativeTime(value: number, t: (key: string, params?: Record<string, string | number>) => string): string | null {
const ms = value < 1_000_000_000_000 ? value * 1000 : value
if (!Number.isFinite(ms)) return null
Expand Down Expand Up @@ -203,6 +242,7 @@ function SessionItem(props: {
const statusDotClass = s.active
? (s.thinking ? 'bg-[#007AFF]' : 'bg-[var(--app-badge-success-text)]')
: 'bg-[var(--app-hint)]'
const todoProgress = getTodoProgress(s)
return (
<>
<button
Expand All @@ -229,16 +269,12 @@ function SessionItem(props: {
{t('session.item.thinking')}
</span>
) : null}
{(() => {
const progress = getTodoProgress(s)
if (!progress) return null
return (
<span className="flex items-center gap-1 text-[var(--app-hint)]">
<BulbIcon className="h-3 w-3" />
{progress.completed}/{progress.total}
</span>
)
})()}
{todoProgress ? (
<span className="flex items-center gap-1 text-[var(--app-hint)]">
<BulbIcon className="h-3 w-3" />
{todoProgress.completed}/{todoProgress.total}
</span>
) : null}
{s.pendingRequestsCount > 0 ? (
<span className="text-[var(--app-badge-warning-text)]">
{t('session.item.pending')} {s.pendingRequestsCount}
Expand Down Expand Up @@ -323,10 +359,11 @@ export function SessionList(props: {
isLoading: boolean
renderHeader?: boolean
api: ApiClient | null
machineLabelsById?: Record<string, string>
selectedSessionId?: string | null
}) {
const { t } = useTranslation()
const { renderHeader = true, api, selectedSessionId } = props
const { renderHeader = true, api, selectedSessionId, machineLabelsById = {} } = props
const groups = useMemo(
() => groupSessionsByDirectory(props.sessions),
[props.sessions]
Expand All @@ -335,28 +372,54 @@ export function SessionList(props: {
() => new Map()
)
const isGroupCollapsed = (group: SessionGroup): boolean => {
const override = collapseOverrides.get(group.directory)
const override = collapseOverrides.get(group.key)
if (override !== undefined) return override
return !group.hasActiveSession
const hasSelectedSession = selectedSessionId
? group.sessions.some(session => session.id === selectedSessionId)
: false
return !group.hasActiveSession && !hasSelectedSession
}

const toggleGroup = (directory: string, isCollapsed: boolean) => {
const toggleGroup = (groupKey: string, isCollapsed: boolean) => {
setCollapseOverrides(prev => {
const next = new Map(prev)
next.set(directory, !isCollapsed)
next.set(groupKey, !isCollapsed)
return next
})
}

const resolveMachineLabel = (machineId: string | null): string => {
if (machineId && machineLabelsById[machineId]) {
return machineLabelsById[machineId]
}
if (machineId) {
return machineId.slice(0, 8)
}
return t('machine.unknown')
}

useEffect(() => {
if (!selectedSessionId) return
setCollapseOverrides(prev => {
const group = groups.find(g =>
g.sessions.some(s => s.id === selectedSessionId)
)
if (!group || !prev.has(group.key) || !prev.get(group.key)) return prev
const next = new Map(prev)
next.delete(group.key)
return next
})
}, [selectedSessionId, groups])

useEffect(() => {
setCollapseOverrides(prev => {
if (prev.size === 0) return prev
const next = new Map(prev)
const knownGroups = new Set(groups.map(group => group.directory))
const knownGroups = new Set(groups.map(group => group.key))
let changed = false
for (const directory of next.keys()) {
if (!knownGroups.has(directory)) {
next.delete(directory)
for (const groupKey of next.keys()) {
if (!knownGroups.has(groupKey)) {
next.delete(groupKey)
changed = true
}
}
Expand Down Expand Up @@ -385,28 +448,38 @@ export function SessionList(props: {
<div className="flex flex-col">
{groups.map((group) => {
const isCollapsed = isGroupCollapsed(group)
const machineLabel = resolveMachineLabel(group.machineId)
return (
<div key={group.directory}>
<div key={group.key} className="mt-2 first:mt-0">
<button
type="button"
onClick={() => toggleGroup(group.directory, isCollapsed)}
className="sticky top-0 z-10 flex w-full items-center gap-2 px-3 py-2 text-left bg-[var(--app-bg)] border-b border-[var(--app-divider)] transition-colors hover:bg-[var(--app-secondary-bg)]"
onClick={() => toggleGroup(group.key, isCollapsed)}
className="sticky top-0 z-10 flex w-full flex-col gap-1 px-3 py-2.5 text-left bg-[var(--app-secondary-bg)] border-b border-[var(--app-border)] border-l-[3px] border-l-[var(--app-hint)] transition-colors hover:bg-[var(--app-subtle-bg)]"
>
<ChevronIcon
className="h-4 w-4 text-[var(--app-hint)]"
collapsed={isCollapsed}
/>
<div className="flex items-center gap-2 min-w-0 flex-1">
<span className="font-medium text-base break-words" title={group.directory}>
<div className="flex items-center gap-2 min-w-0 w-full">
<ChevronIcon
className="h-4 w-4 text-[var(--app-hint)] shrink-0"
collapsed={isCollapsed}
/>
<span className="font-semibold text-sm break-words min-w-0" title={group.directory}>
{group.displayName}
</span>
<span className="shrink-0 text-xs text-[var(--app-hint)]">
({group.sessions.length})
<span className="shrink-0 rounded-full bg-[var(--app-subtle-bg)] px-1.5 py-0.5 text-[10px] font-medium text-[var(--app-hint)]">
{group.sessions.length}
</span>
</div>
<div className="flex min-w-0 w-full flex-wrap items-center gap-2 pl-6 text-xs text-[var(--app-hint)]">
<span className="inline-flex items-center gap-1 rounded border border-[var(--app-border)] bg-[var(--app-bg)] px-2 py-0.5">
<MachineIcon className="h-3 w-3 shrink-0" />
{machineLabel}
</span>
<span className="min-w-0 flex-1 truncate" title={group.directory}>
{group.directory}
</span>
</div>
</button>
{!isCollapsed ? (
<div className="flex flex-col divide-y divide-[var(--app-divider)] border-b border-[var(--app-divider)]">
<div className="flex flex-col divide-y divide-[var(--app-divider)] border-b border-[var(--app-divider)] border-l border-l-[var(--app-divider)]">
{group.sessions.map((s) => (
<SessionItem
key={s.id}
Expand Down
22 changes: 20 additions & 2 deletions web/src/router.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useCallback } from 'react'
import { useCallback, useMemo } from 'react'
import { useQueryClient } from '@tanstack/react-query'
import {
Navigate,
Expand Down Expand Up @@ -30,6 +30,7 @@ import { queryKeys } from '@/lib/query-keys'
import { useToast } from '@/lib/toast-context'
import { useTranslation } from '@/lib/use-translation'
import { fetchLatestMessages, seedMessageWindowFromSession } from '@/lib/message-window-store'
import type { Machine } from '@/types/api'
import FilesPage from '@/routes/sessions/files'
import FilePage from '@/routes/sessions/file'
import TerminalPage from '@/routes/sessions/terminal'
Expand Down Expand Up @@ -94,19 +95,35 @@ function SettingsIcon(props: { className?: string }) {
)
}

function getMachineTitle(machine: Machine): string {
if (machine.metadata?.displayName) return machine.metadata.displayName
if (machine.metadata?.host) return machine.metadata.host
return machine.id.slice(0, 8)
}

function SessionsPage() {
const { api } = useAppContext()
const navigate = useNavigate()
const pathname = useLocation({ select: location => location.pathname })
const matchRoute = useMatchRoute()
const { t } = useTranslation()
const { sessions, isLoading, error, refetch } = useSessions(api)
const { machines } = useMachines(api, true)

const handleRefresh = useCallback(() => {
void refetch()
}, [refetch])

const projectCount = new Set(sessions.map(s => s.metadata?.worktree?.basePath ?? s.metadata?.path ?? 'Other')).size
const projectCount = useMemo(() => new Set(sessions.map(s =>
s.metadata?.worktree?.basePath ?? s.metadata?.path ?? 'Other'
)).size, [sessions])
const machineLabelsById = useMemo(() => {
const labels: Record<string, string> = {}
for (const machine of machines) {
labels[machine.id] = getMachineTitle(machine)
}
return labels
}, [machines])
const sessionMatch = matchRoute({ to: '/sessions/$sessionId', fuzzy: true })
const selectedSessionId = sessionMatch && sessionMatch.sessionId !== 'new' ? sessionMatch.sessionId : null
const isSessionsIndex = pathname === '/sessions' || pathname === '/sessions/'
Expand Down Expand Up @@ -160,6 +177,7 @@ function SessionsPage() {
isLoading={isLoading}
renderHeader={false}
api={api}
machineLabelsById={machineLabelsById}
/>
</div>
</div>
Expand Down
Loading