Skip to content

sessions: surface archived state in session header #320392

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
sandy081 merged 2 commits into from
Jun 8, 2026
+18 −14
Merged

sessions: surface archived state in session header #320392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02bfc5f
sessions: surface archived state in session header
sandy081 Jun 8, 2026
d249314
sessions: show Mark as Done in session header toolbar
sandy081 Jun 8, 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
6 changes: 3 additions & 3 deletions src/vs/sessions/contrib/sessions/browser/sessionsActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../.
import { EditorAreaFocusContext, IsAuxiliaryWindowContext, IsSessionsWindowContext } from '../../../../workbench/common/contextkeys.js';
import { Menus } from '../../../browser/menus.js';
import { SessionsCategories } from '../../../common/categories.js';
import { CanGoBackContext, CanGoForwardContext, ChatSessionProviderIdContext, MultipleSessionsVisibleContext, SessionIsCreatedContext, SessionIsMaximizedContext, SessionIsStickyContext, SessionsFocusContext, SessionSupportsMultipleChatsContext, SessionsWelcomeVisibleContext } from '../../../common/contextkeys.js';
import { CanGoBackContext, CanGoForwardContext, ChatSessionProviderIdContext, MultipleSessionsVisibleContext, SessionIsArchivedContext, SessionIsCreatedContext, SessionIsMaximizedContext, SessionIsStickyContext, SessionsFocusContext, SessionSupportsMultipleChatsContext, SessionsWelcomeVisibleContext } from '../../../common/contextkeys.js';
import { ANY_AGENT_HOST_PROVIDER_RE } from '../../../common/agentHostSessionsProvider.js';
import { IActiveSession, ISessionsManagementService } from '../../../services/sessions/common/sessionsManagement.js';
import { ISessionsViewService } from '../../../browser/sessionsViewService.js';
Expand Down Expand Up @@ -354,7 +354,7 @@ registerAction2(class AddChatToSessionBarAction extends Action2 {
icon: Codicon.add,
menu: {
id: Menus.SessionBarToolbar,
when: ContextKeyExpr.and(SessionIsCreatedContext, SessionSupportsMultipleChatsContext),
when: ContextKeyExpr.and(SessionIsCreatedContext, SessionSupportsMultipleChatsContext, SessionIsArchivedContext.negate()),
group: 'navigation',
order: 10,
},
Expand Down Expand Up @@ -388,7 +388,7 @@ registerAction2(class TogglePinSessionAction extends Action2 {
id: Menus.SessionBarToolbar,
group: '1_session',
order: 10,
when: SessionIsCreatedContext,
when: ContextKeyExpr.and(SessionIsCreatedContext, SessionIsArchivedContext.negate()),
},
Comment thread
sandy081 marked this conversation as resolved.
});
}
Expand Down
21 changes: 11 additions & 10 deletions src/vs/sessions/contrib/sessions/browser/views/sessionsViewActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../../pla
import { KeybindingsRegistry, KeybindingWeight } from '../../../../../platform/keybinding/common/keybindingsRegistry.js';
import { IViewsService } from '../../../../../workbench/services/views/common/viewsService.js';
import { CLOSE_MOBILE_SIDEBAR_DRAWER_COMMAND_ID } from '../../../../browser/workbench.js';
import { EditorsVisibleContext, EditorAreaFocusContext, IsAuxiliaryWindowContext, IsSessionsWindowContext } from '../../../../../workbench/common/contextkeys.js';
import { EditorsVisibleContext, EditorAreaFocusContext, IsSessionsWindowContext } from '../../../../../workbench/common/contextkeys.js';
import { ANY_AGENT_HOST_PROVIDER_RE } from '../../../../common/agentHostSessionsProvider.js';
import { SessionsCategories } from '../../../../common/categories.js';
import { ChatSessionProviderIdContext, IsActiveSessionArchivedContext, IsNewChatSessionContext, SessionIsArchivedContext, SessionIsReadContext, SessionsWelcomeVisibleContext } from '../../../../common/contextkeys.js';
import { ChatSessionProviderIdContext, IsActiveSessionArchivedContext, IsNewChatSessionContext, SessionIsArchivedContext, SessionIsReadContext } from '../../../../common/contextkeys.js';
import { SessionItemToolbarMenuId, SessionItemContextMenuId, SessionSectionToolbarMenuId, SessionSectionTypeContext, IsSessionPinnedContext, SessionsGrouping, SessionsSorting, ISessionSection } from './sessionsList.js';
import { ISession, SessionStatus } from '../../../../services/sessions/common/session.js';
import { IsWorkspaceGroupCappedContext, SessionsViewFilterOptionsSubMenu, SessionsViewFilterSubMenu, SessionsViewGroupingContext, SessionsViewId, SessionsView, SessionsViewSortingContext, openSessionToTheSide } from './sessionsView.js';
Expand Down Expand Up @@ -589,6 +589,11 @@ registerAction2(class ArchiveSessionAction extends Action2 {
group: '1_edit',
order: 2,
when: ContextKeyExpr.equals(SessionIsArchivedContext.key, false),
}, {
id: Menus.SessionBarToolbar,
group: 'navigation',
order: 15,
when: ContextKeyExpr.equals(SessionIsArchivedContext.key, false),
}]
});
}
Expand Down Expand Up @@ -621,14 +626,10 @@ registerAction2(class UnarchiveSessionAction extends Action2 {
order: 2,
when: ContextKeyExpr.equals(SessionIsArchivedContext.key, true),
}, {
id: Menus.CommandCenter,
order: 103,
when: ContextKeyExpr.and(
IsAuxiliaryWindowContext.negate(),
SessionsWelcomeVisibleContext.negate(),
IsNewChatSessionContext.negate(),
IsActiveSessionArchivedContext
)
id: Menus.SessionBarToolbar,
group: 'navigation',
order: 5,
when: ContextKeyExpr.equals(SessionIsArchivedContext.key, true),
}]
});
}
Expand Down
5 changes: 4 additions & 1 deletion src/vs/sessions/services/sessions/browser/sessionsListModelService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,13 @@ export class SessionsListModelService extends Disposable implements ISessionsLis
case SessionStatus.Error:
return { ...Codicon.error, color: themeColorFromId('errorForeground') };
default:
if (isArchived) {
return { ...Codicon.passFilled, color: themeColorFromId('agentSessionReadIndicator.foreground') };
}
if (pullRequestIcon) {
return pullRequestIcon;
}
if (!isRead && !isArchived) {
if (!isRead) {
return { ...Codicon.circleFilled, color: themeColorFromId('textLink.foreground') };
}
return { ...Codicon.circleSmallFilled, color: themeColorFromId('agentSessionReadIndicator.foreground') };
Expand Down
Loading