Files
claudecodeui/src/components/sidebar/view/subcomponents/SidebarContent.tsx
Haileyesus 591b18e9e3 feat(sidebar): improve running session state tracking
Add a running-session view to the sidebar, including header controls, running counts, empty states, and row-level processing indicators so active provider work is visible outside the current chat.

Hydrate running state after refresh through a status-only /api/providers/sessions/running endpoint backed by chatRunRegistry.listRunningRuns, then sync and poll the frontend processingSessions map from AppContent without attaching to chat streams or replaying messages.

Preserve fresh local processing entries during sync so newly sent messages are not cleared before the backend registry catches up, and clear completed sessions once the status endpoint no longer reports them.

Thread active session state through sidebar project/session components, show rotating loaders for processing sessions, and keep the running search mode expanded and filterable.

Fix optimistic local user-message dedupe so repeated prompts are only collapsed when a matching server echo appears from the same send window, preventing sent messages from disappearing until assistant completion.

Add registry test coverage for listing currently running app sessions.

Tests: npx eslint on changed files; npx tsc --noEmit -p tsconfig.json; npx tsc --noEmit -p server/tsconfig.json; npx tsx --tsconfig server/tsconfig.json --test server/modules/websocket/tests/chat-run-registry.test.ts.
2026-06-11 20:04:38 +03:00

566 lines
27 KiB
TypeScript

import { type ReactNode } from 'react';
import { Activity, Archive, Folder, MessageSquare, RotateCcw, Search, Trash2 } from 'lucide-react';
import type { TFunction } from 'i18next';
import { ScrollArea } from '../../../../shared/view/ui';
import type { Project } from '../../../../types/app';
import type { ReleaseInfo } from '../../../../types/sharedTypes';
import type { ConversationSearchResults, SearchProgress } from '../../hooks/useSidebarController';
import type { ArchivedProjectListItem, ArchivedSessionListItem, SidebarSearchMode } from '../../types/types';
import SessionProviderLogo from '../../../llm-logo-provider/SessionProviderLogo';
import { getAllSessions } from '../../utils/utils';
import SidebarFooter from './SidebarFooter';
import SidebarHeader from './SidebarHeader';
import SidebarProjectList, { type SidebarProjectListProps } from './SidebarProjectList';
function HighlightedSnippet({ snippet, highlights }: { snippet: string; highlights: { start: number; end: number }[] }) {
const parts: ReactNode[] = [];
let cursor = 0;
for (const h of highlights) {
if (h.start > cursor) {
parts.push(snippet.slice(cursor, h.start));
}
parts.push(
<mark key={h.start} className="rounded-sm bg-yellow-200 px-0.5 text-foreground dark:bg-yellow-800">
{snippet.slice(h.start, h.end)}
</mark>
);
cursor = h.end;
}
if (cursor < snippet.length) {
parts.push(snippet.slice(cursor));
}
return (
<span className="text-xs leading-relaxed text-muted-foreground">
{parts}
</span>
);
}
type ArchivedSessionGroup = {
key: string;
projectId: string | null;
projectDisplayName: string;
projectPath: string | null;
isProjectArchived: boolean;
sessions: ArchivedSessionListItem[];
latestActivity: string | null;
};
/**
* Groups archived sessions by project metadata so the archive view preserves
* the same mental model as the active sidebar: projects first, then sessions.
*/
function groupArchivedSessionsByProject(sessions: ArchivedSessionListItem[]): ArchivedSessionGroup[] {
const groups = new Map<string, ArchivedSessionGroup>();
for (const session of sessions) {
const key = session.projectId ?? session.projectPath ?? `session:${session.sessionId}`;
const existingGroup = groups.get(key);
if (existingGroup) {
existingGroup.sessions.push(session);
if (!existingGroup.latestActivity || (session.lastActivity && session.lastActivity > existingGroup.latestActivity)) {
existingGroup.latestActivity = session.lastActivity;
}
continue;
}
groups.set(key, {
key,
projectId: session.projectId,
projectDisplayName: session.projectDisplayName,
projectPath: session.projectPath,
isProjectArchived: session.isProjectArchived,
sessions: [session],
latestActivity: session.lastActivity,
});
}
return [...groups.values()].sort((groupA, groupB) => {
const a = groupA.latestActivity ?? '';
const b = groupB.latestActivity ?? '';
return b.localeCompare(a);
});
}
function formatCompactArchivedAge(dateString: string | null): string {
if (!dateString) {
return '';
}
const date = new Date(dateString);
if (Number.isNaN(date.getTime())) {
return '';
}
const diffInMinutes = Math.floor(Math.max(0, Date.now() - date.getTime()) / (1000 * 60));
if (diffInMinutes < 1) {
return '<1m';
}
if (diffInMinutes < 60) {
return `${diffInMinutes}m`;
}
const diffInHours = Math.floor(diffInMinutes / 60);
if (diffInHours < 24) {
return `${diffInHours}hr`;
}
return `${Math.floor(diffInHours / 24)}d`;
}
type SidebarContentProps = {
isPWA: boolean;
isMobile: boolean;
isLoading: boolean;
projects: Project[];
runningSessionsCount: number;
archivedProjects: ArchivedProjectListItem[];
archivedSessions: ArchivedSessionListItem[];
archivedSessionsCount: number;
isArchivedSessionsLoading: boolean;
searchFilter: string;
onSearchFilterChange: (value: string) => void;
onClearSearchFilter: () => void;
searchMode: SidebarSearchMode;
onSearchModeChange: (mode: SidebarSearchMode) => void;
conversationResults: ConversationSearchResults | null;
isSearching: boolean;
searchProgress: SearchProgress | null;
onRestoreArchivedProject: (projectId: string) => void;
onArchivedSessionClick: (session: ArchivedSessionListItem) => void;
onRestoreArchivedSession: (sessionId: string) => void;
onDeleteArchivedSession: (session: ArchivedSessionListItem) => void;
// Conversation result clicks pass back the DB projectId (or null when the
// server couldn't resolve it). Consumers must handle the null case.
onConversationResultClick: (projectId: string | null, sessionId: string, provider: string, messageTimestamp?: string | null, messageSnippet?: string | null) => void;
onRefresh: () => void;
isRefreshing: boolean;
onCreateProject: () => void;
onCollapseSidebar: () => void;
updateAvailable: boolean;
releaseInfo: ReleaseInfo | null;
latestVersion: string | null;
currentVersion: string;
onShowVersionModal: () => void;
onShowSettings: () => void;
projectListProps: SidebarProjectListProps;
t: TFunction;
};
export default function SidebarContent({
isPWA,
isMobile,
isLoading,
projects,
runningSessionsCount,
archivedProjects,
archivedSessions,
archivedSessionsCount,
isArchivedSessionsLoading,
searchFilter,
onSearchFilterChange,
onClearSearchFilter,
searchMode,
onSearchModeChange,
conversationResults,
isSearching,
searchProgress,
onRestoreArchivedProject,
onArchivedSessionClick,
onRestoreArchivedSession,
onDeleteArchivedSession,
onConversationResultClick,
onRefresh,
isRefreshing,
onCreateProject,
onCollapseSidebar,
updateAvailable,
releaseInfo,
latestVersion,
currentVersion,
onShowVersionModal,
onShowSettings,
projectListProps,
t,
}: SidebarContentProps) {
const showConversationSearch = searchMode === 'conversations' && searchFilter.trim().length >= 2;
const hasPartialResults = conversationResults && conversationResults.results.length > 0;
const groupedArchivedSessions = groupArchivedSessionsByProject(archivedSessions);
return (
<div
className="flex h-full flex-col bg-background/80 backdrop-blur-sm md:w-72 md:select-none"
style={{}}
>
<SidebarHeader
isPWA={isPWA}
isMobile={isMobile}
isLoading={isLoading}
projectsCount={projects.length}
runningSessionsCount={runningSessionsCount}
archivedSessionsCount={archivedSessionsCount}
isArchivedSessionsLoading={isArchivedSessionsLoading}
searchFilter={searchFilter}
onSearchFilterChange={onSearchFilterChange}
onClearSearchFilter={onClearSearchFilter}
searchMode={searchMode}
onSearchModeChange={onSearchModeChange}
onRefresh={onRefresh}
isRefreshing={isRefreshing}
onCreateProject={onCreateProject}
onCollapseSidebar={onCollapseSidebar}
t={t}
/>
<ScrollArea className="flex-1 overflow-y-auto overscroll-contain md:px-1.5 md:py-2">
{showConversationSearch ? (
isSearching && !hasPartialResults ? (
<div className="px-4 py-12 text-center md:py-8">
<div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-lg bg-muted md:mb-3">
<div className="h-6 w-6 animate-spin rounded-full border-2 border-muted-foreground border-t-transparent" />
</div>
<p className="text-sm text-muted-foreground">{t('search.searching')}</p>
{searchProgress && (
<p className="mt-1 text-xs text-muted-foreground/60">
{t('search.projectsScanned', { count: searchProgress.scannedProjects })}/{searchProgress.totalProjects}
</p>
)}
</div>
) : !isSearching && conversationResults && conversationResults.results.length === 0 ? (
<div className="px-4 py-12 text-center md:py-8">
<div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-lg bg-muted md:mb-3">
<Search className="h-6 w-6 text-muted-foreground" />
</div>
<h3 className="mb-2 text-base font-medium text-foreground md:mb-1">{t('search.noResults')}</h3>
<p className="text-sm text-muted-foreground">{t('search.tryDifferentQuery')}</p>
</div>
) : hasPartialResults ? (
<div className="space-y-3 px-2">
<div className="flex items-center justify-between px-1">
<p className="text-xs text-muted-foreground">
{t('search.matches', { count: conversationResults.totalMatches })}
</p>
{isSearching && searchProgress && (
<div className="flex items-center gap-1.5">
<div className="h-3 w-3 animate-spin rounded-full border-[1.5px] border-muted-foreground/40 border-t-primary" />
<p className="text-[10px] text-muted-foreground/60">
{searchProgress.scannedProjects}/{searchProgress.totalProjects}
</p>
</div>
)}
</div>
{isSearching && searchProgress && (
<div className="mx-1 h-0.5 overflow-hidden rounded-full bg-muted">
<div
className="h-full rounded-full bg-primary/60 transition-all duration-300"
style={{ width: `${Math.round((searchProgress.scannedProjects / searchProgress.totalProjects) * 100)}%` }}
/>
</div>
)}
{conversationResults.results.map((projectResult) => (
<div key={projectResult.projectName} className="space-y-1">
<div className="flex items-center gap-1.5 px-1 py-1">
<Folder className="h-3 w-3 flex-shrink-0 text-muted-foreground" />
<span className="truncate text-xs font-medium text-foreground">
{projectResult.projectDisplayName}
</span>
</div>
{projectResult.sessions.map((session) => (
<button
key={`${projectResult.projectId ?? projectResult.projectName}-${session.sessionId}`}
className="w-full rounded-md px-2 py-2 text-left transition-colors hover:bg-accent/50"
onClick={() => onConversationResultClick(
// Pass the DB projectId (preferred) so the parent can
// cross-reference with the loaded projects list.
projectResult.projectId,
session.sessionId,
session.provider || session.matches[0]?.provider || 'claude',
session.matches[0]?.timestamp,
session.matches[0]?.snippet
)}
>
<div className="mb-1 flex items-center gap-1.5">
<MessageSquare className="h-3 w-3 flex-shrink-0 text-primary" />
<span className="truncate text-xs font-medium text-foreground">
{session.sessionSummary}
</span>
{session.provider && session.provider !== 'claude' && (
<span className="flex-shrink-0 rounded bg-muted px-1 py-0.5 text-[9px] uppercase text-muted-foreground">
{session.provider}
</span>
)}
</div>
<div className="space-y-1 pl-4">
{session.matches.map((match, idx) => (
<div key={idx} className="flex items-start gap-1">
<span className="mt-0.5 flex-shrink-0 text-[10px] font-medium uppercase text-muted-foreground/60">
{match.role === 'user' ? 'U' : 'A'}
</span>
<HighlightedSnippet
snippet={match.snippet}
highlights={match.highlights}
/>
</div>
))}
</div>
</button>
))}
</div>
))}
</div>
) : null
) : searchMode === 'running' ? (
projectListProps.filteredProjects.length === 0 ? (
<div className="px-4 py-12 text-center md:py-8">
<div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-lg border border-border/70 bg-muted/50 md:mb-3">
<Activity className="h-6 w-6 text-muted-foreground" />
</div>
<h3 className="mb-2 text-base font-medium text-foreground md:mb-1">
{t('running.emptyTitle', 'No sessions running')}
</h3>
<p className="text-sm text-muted-foreground">
{runningSessionsCount > 0
? t('running.noMatchingSessions', 'No running sessions match this search.')
: t('running.emptyDescription', 'Active work will appear here while a provider is processing.')}
</p>
</div>
) : (
<div className="space-y-2">
<div className="mx-2 flex items-center justify-between rounded-lg border border-border/60 bg-card/50 px-3 py-2 shadow-sm">
<div className="flex min-w-0 items-center gap-2">
<span className="flex h-6 w-6 items-center justify-center rounded-md bg-emerald-500/10 text-emerald-600 dark:text-emerald-400">
<Activity className="h-3.5 w-3.5" />
</span>
<span className="truncate text-xs font-medium text-foreground">
{t('running.title', 'Running now')}
</span>
</div>
<span className="rounded-full bg-emerald-500/10 px-2 py-0.5 text-[11px] font-medium text-emerald-700 dark:text-emerald-300">
{runningSessionsCount}
</span>
</div>
<SidebarProjectList {...projectListProps} />
</div>
)
) : searchMode === 'archived' ? (
isArchivedSessionsLoading ? (
<div className="px-4 py-12 text-center md:py-8">
<div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-lg bg-muted md:mb-3">
<div className="h-6 w-6 animate-spin rounded-full border-2 border-muted-foreground border-t-transparent" />
</div>
<h3 className="mb-2 text-base font-medium text-foreground md:mb-1">
{t('archived.loadingTitle', 'Loading archive...')}
</h3>
<p className="text-sm text-muted-foreground">
{t('archived.loadingDescription', 'Fetching hidden workspaces and sessions you can restore later.')}
</p>
</div>
) : archivedProjects.length === 0 && groupedArchivedSessions.length === 0 ? (
<div className="px-4 py-12 text-center md:py-8">
<div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-lg bg-muted md:mb-3">
<Archive className="h-6 w-6 text-muted-foreground" />
</div>
<h3 className="mb-2 text-base font-medium text-foreground md:mb-1">
{archivedSessionsCount > 0
? t('archived.noMatchingSessions', 'No matching archived items')
: t('archived.emptyTitle', 'No archived items')}
</h3>
<p className="text-sm text-muted-foreground">
{archivedSessionsCount > 0
? t('archived.tryDifferentSearch', 'Try a different search term.')
: t('archived.emptyDescription', 'Archived workspaces and sessions will appear here when you hide them from the active list.')}
</p>
</div>
) : (
<div className="space-y-3 px-2">
<div className="flex items-center justify-between px-1">
<p className="text-xs text-muted-foreground">
{`${archivedSessionsCount} ${t(
archivedSessionsCount === 1 ? 'archived.sessionCountOne' : 'archived.sessionCountOther',
archivedSessionsCount === 1 ? 'archived item' : 'archived items',
)}`}
</p>
</div>
{archivedProjects.map((project) => {
const projectSessions = getAllSessions(project);
return (
<div key={project.projectId} className="overflow-hidden rounded-xl border border-border/70 bg-card/60 shadow-sm">
<div className="flex items-start justify-between gap-3 border-b border-border/60 px-3 py-2.5">
<div className="min-w-0">
<div className="flex items-center gap-2">
<Folder className="h-3.5 w-3.5 flex-shrink-0 text-muted-foreground" />
<span className="truncate text-sm font-medium text-foreground">
{project.displayName}
</span>
<span className="inline-flex items-center justify-center rounded-full bg-muted px-1 py-px text-center text-[7px] font-medium uppercase leading-none tracking-[0.02em] text-muted-foreground">
{t('archived.projectArchived', 'Project archived')}
</span>
</div>
<p className="mt-1 truncate text-xs text-muted-foreground/70" title={project.fullPath}>
{project.fullPath}
</p>
</div>
<button
className="flex h-7 w-7 flex-shrink-0 items-center justify-center rounded-lg bg-emerald-50 text-emerald-700 transition-colors hover:bg-emerald-100 dark:bg-emerald-900/20 dark:text-emerald-300 dark:hover:bg-emerald-900/30"
onClick={() => onRestoreArchivedProject(project.projectId)}
title={t('archived.restoreProject', 'Restore workspace')}
>
<RotateCcw className="h-3.5 w-3.5" />
</button>
</div>
{projectSessions.length > 0 && (
<div className="divide-y divide-border/50">
{projectSessions.map((session) => (
<button
key={String(session.id)}
className="flex w-full items-center gap-2 px-3 py-2.5 text-left transition-colors hover:bg-accent/40"
onClick={() => onArchivedSessionClick({
sessionId: String(session.id),
provider: session.__provider,
projectId: project.projectId,
projectPath: project.fullPath,
projectDisplayName: project.displayName,
sessionTitle:
(typeof session.summary === 'string' && session.summary.trim().length > 0
? session.summary
: typeof session.name === 'string' && session.name.trim().length > 0
? session.name
: String(session.id)),
createdAt: typeof session.created_at === 'string' ? session.created_at : null,
updatedAt: typeof session.updated_at === 'string' ? session.updated_at : null,
lastActivity:
typeof session.lastActivity === 'string'
? session.lastActivity
: typeof session.updated_at === 'string'
? session.updated_at
: typeof session.created_at === 'string'
? session.created_at
: null,
isProjectArchived: true,
})}
>
<SessionProviderLogo provider={session.__provider} className="h-3.5 w-3.5 flex-shrink-0" />
<div className="min-w-0 flex-1">
<div className="flex items-center gap-2">
<span className="truncate text-xs font-medium text-foreground">
{(typeof session.summary === 'string' && session.summary.trim().length > 0
? session.summary
: typeof session.name === 'string' && session.name.trim().length > 0
? session.name
: String(session.id))}
</span>
<span className="ml-auto flex-shrink-0 text-[11px] text-muted-foreground">
{formatCompactArchivedAge(
typeof session.lastActivity === 'string'
? session.lastActivity
: typeof session.updated_at === 'string'
? session.updated_at
: typeof session.created_at === 'string'
? session.created_at
: null,
)}
</span>
</div>
<p className="mt-0.5 text-[11px] uppercase tracking-wide text-muted-foreground/70">
{session.__provider}
</p>
</div>
</button>
))}
</div>
)}
</div>
);
})}
{groupedArchivedSessions.map((group) => (
<div key={group.key} className="overflow-hidden rounded-xl border border-border/70 bg-card/60 shadow-sm">
<div className="flex items-start justify-between gap-3 border-b border-border/60 px-3 py-2.5">
<div className="min-w-0">
<div className="flex items-center gap-2">
<Folder className="h-3.5 w-3.5 flex-shrink-0 text-muted-foreground" />
<span className="truncate text-sm font-medium text-foreground">
{group.projectDisplayName}
</span>
{group.isProjectArchived && (
<span className="inline-flex items-center justify-center rounded-full bg-muted px-1 py-px text-center text-[7px] font-medium uppercase leading-none tracking-[0.02em] text-muted-foreground">
{t('archived.projectArchived', 'Project archived')}
</span>
)}
</div>
{group.projectPath && (
<p className="mt-1 truncate text-xs text-muted-foreground/70" title={group.projectPath}>
{group.projectPath}
</p>
)}
</div>
<span className="flex-shrink-0 text-[11px] text-muted-foreground">
{group.sessions.length}
</span>
</div>
<div className="divide-y divide-border/50">
{group.sessions.map((session) => (
<div key={session.sessionId} className="flex items-center gap-2 px-3 py-2.5">
<button
className="flex min-w-0 flex-1 items-center gap-2 text-left transition-colors hover:text-foreground"
onClick={() => onArchivedSessionClick(session)}
>
<SessionProviderLogo provider={session.provider} className="h-3.5 w-3.5 flex-shrink-0" />
<div className="min-w-0 flex-1">
<div className="flex items-center gap-2">
<span className="truncate text-xs font-medium text-foreground">
{session.sessionTitle}
</span>
{session.lastActivity && (
<span className="ml-auto flex-shrink-0 text-[11px] text-muted-foreground">
{formatCompactArchivedAge(session.lastActivity)}
</span>
)}
</div>
<p className="mt-0.5 text-[11px] uppercase tracking-wide text-muted-foreground/70">
{session.provider}
</p>
</div>
</button>
<button
className="flex h-7 w-7 flex-shrink-0 items-center justify-center rounded-lg bg-emerald-50 text-emerald-700 transition-colors hover:bg-emerald-100 dark:bg-emerald-900/20 dark:text-emerald-300 dark:hover:bg-emerald-900/30"
onClick={() => onRestoreArchivedSession(session.sessionId)}
title={t('archived.restore', 'Restore session')}
>
<RotateCcw className="h-3.5 w-3.5" />
</button>
<button
className="flex h-7 w-7 flex-shrink-0 items-center justify-center rounded-lg bg-red-50 text-red-700 transition-colors hover:bg-red-100 dark:bg-red-900/20 dark:text-red-300 dark:hover:bg-red-900/30"
onClick={() => onDeleteArchivedSession(session)}
title={t('archived.deletePermanently', 'Delete permanently')}
>
<Trash2 className="h-3.5 w-3.5" />
</button>
</div>
))}
</div>
</div>
))}
</div>
)
) : (
<SidebarProjectList {...projectListProps} />
)}
</ScrollArea>
<SidebarFooter
updateAvailable={updateAvailable}
releaseInfo={releaseInfo}
latestVersion={latestVersion}
currentVersion={currentVersion}
onShowVersionModal={onShowVersionModal}
onShowSettings={onShowSettings}
t={t}
/>
</div>
);
}