Skip to content

refactor - simplify session grouping logic in groupAgentSessionsByActive #290339

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
bpasero merged 1 commit into from
Jan 26, 2026
Merged

refactor - simplify session grouping logic in groupAgentSessionsByActive #290339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 1 addition & 17 deletions src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsViewer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,16 +735,11 @@ export function groupAgentSessionsByActive(sessions: IAgentSession[]): Map<Agent
const startOfToday = new Date(now).setHours(0, 0, 0, 0);
const startOfYesterday = startOfToday - DAY_THRESHOLD;

let mostRecentSession: { session: IAgentSession; time: number } | undefined;
for (const session of sessions) {
const sessionTime = session.timing.lastRequestEnded ?? session.timing.lastRequestStarted ?? session.timing.created;
if (!mostRecentSession || sessionTime > mostRecentSession.time) {
mostRecentSession = { session, time: sessionTime }; // always keep track of the most recent session
}

if (session.isArchived()) {
historySessions.add(session);
} else {
const sessionTime = session.timing.lastRequestEnded ?? session.timing.lastRequestStarted ?? session.timing.created;
if (
isSessionInProgressStatus(session.status) || // in-progress
!session.isRead() || // unread
Expand All @@ -758,17 +753,6 @@ export function groupAgentSessionsByActive(sessions: IAgentSession[]): Map<Agent
}
}

// Consider most recent from today or yesterday. This helps
// restore the session after restart when chat is cleared.
if (
mostRecentSession && !mostRecentSession.session.isArchived() &&
mostRecentSession.time >= startOfYesterday &&
!activeSessions.has(mostRecentSession.session)
) {
historySessions.delete(mostRecentSession.session);
activeSessions.add(mostRecentSession.session);
}

return new Map<AgentSessionSection, IAgentSessionSection>([
[AgentSessionSection.Active, { section: AgentSessionSection.Active, label: AgentSessionSectionLabels[AgentSessionSection.Active], sessions: [...activeSessions] }],
[AgentSessionSection.History, { section: AgentSessionSection.History, label: localize('agentSessions.historySectionWithCount', "History ({0})", historySessions.size), sessions: [...historySessions] }],
Expand Down
Loading